From: Colin Leroy Date: Fri, 5 Oct 2007 06:10:46 +0000 (+0000) Subject: 2007-10-05 [colin] 3.0.2cvs11 X-Git-Tag: rel_3_1_0~150 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=7127ff8774372c817adbd820f316bd74ddf1cc0b 2007-10-05 [colin] 3.0.2cvs11 * src/procmime.c * src/common/mgutils.c Fix warnings --- diff --git a/ChangeLog b/ChangeLog index b495805c8..0e2025994 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-05 [colin] 3.0.2cvs11 + + * src/procmime.c + * src/common/mgutils.c + Fix warnings + 2007-10-05 [mones] 3.0.2cvs10 * manual/advanced.xml diff --git a/PATCHSETS b/PATCHSETS index d730a5a22..1a9367859 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2923,3 +2923,4 @@ ( cvs diff -u -r 1.1.2.41 -r 1.1.2.42 manual/advanced.xml; ) > 3.0.2cvs8.patchset ( cvs diff -u -r 1.12.2.48 -r 1.12.2.49 src/action.c; cvs diff -u -r 1.22.2.16 -r 1.22.2.17 src/addrbook.c; cvs diff -u -r 1.28.2.31 -r 1.28.2.32 src/addrindex.c; cvs diff -u -r 1.382.2.412 -r 1.382.2.413 src/compose.c; cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/exporthtml.c; cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/exportldif.c; cvs diff -u -r 1.213.2.164 -r 1.213.2.165 src/folder.c; cvs diff -u -r 1.115.2.168 -r 1.115.2.169 src/main.c; cvs diff -u -r 1.75.2.49 -r 1.75.2.50 src/matcher.c; cvs diff -u -r 1.28.2.38 -r 1.28.2.39 src/mbox.c; cvs diff -u -r 1.94.2.153 -r 1.94.2.154 src/messageview.c; cvs diff -u -r 1.79.2.63 -r 1.79.2.64 src/mh.c; cvs diff -u -r 1.101.2.40 -r 1.101.2.41 src/news.c; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/partial_download.c; cvs diff -u -r 1.56.2.56 -r 1.56.2.57 src/pop.c; cvs diff -u -r 1.49.2.98 -r 1.49.2.99 src/procmime.c; cvs diff -u -r 1.150.2.103 -r 1.150.2.104 src/procmsg.c; cvs diff -u -r 1.43.2.83 -r 1.43.2.84 src/toolbar.c; cvs diff -u -r 1.6.2.17 -r 1.6.2.18 src/common/log.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/mgutils.c; cvs diff -u -r 1.13.2.31 -r 1.13.2.32 src/common/plugin.c; cvs diff -u -r 1.36.2.115 -r 1.36.2.116 src/common/utils.c; cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/common/xml.c; cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/common/xml.h; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/common/xmlprops.c; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/common/xmlprops.h; cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.13.2.34 -r 1.13.2.35 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/plugins/dillo_viewer/dillo_prefs.c; cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/plugins/pgpcore/prefs_gpg.c; cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.50 -r 1.1.2.51 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.18.2.57 -r 1.18.2.58 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/trayicon/trayicon_prefs.c; ) > 3.0.2cvs9.patchset ( cvs diff -u -r 1.1.2.42 -r 1.1.2.43 manual/advanced.xml; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 manual/es/advanced.xml; ) > 3.0.2cvs10.patchset +( cvs diff -u -r 1.49.2.99 -r 1.49.2.100 src/procmime.c; cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/common/mgutils.c; ) > 3.0.2cvs11.patchset diff --git a/configure.ac b/configure.ac index 3f81986f3..d2e9459a1 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=10 +EXTRA_VERSION=11 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/common/mgutils.c b/src/common/mgutils.c index a2a91861e..d256ffcc3 100644 --- a/src/common/mgutils.c +++ b/src/common/mgutils.c @@ -35,6 +35,10 @@ void mgu_print_list( GSList *list, FILE *stream ) { GSList *node = list; while( node ) { int r = fprintf( stream, "\t- >%s<\n", (gchar *)node->data ); + if (r < 0) { + perror("fprintf"); + break; + } node = g_slist_next( node ); } } @@ -46,6 +50,10 @@ void mgu_print_dlist( GList *list, FILE *stream ) { GList *node = list; while( node ) { int r = fprintf( stream, "\t- >%s<\n", (gchar *)node->data ); + if (r < 0) { + perror("fprintf"); + break; + } node = g_list_next( node ); } } diff --git a/src/procmime.c b/src/procmime.c index f89f6b711..deab098aa 100644 --- a/src/procmime.c +++ b/src/procmime.c @@ -2326,7 +2326,7 @@ static gint procmime_write_message_rfc822(MimeInfo *mimeinfo, FILE *fp) } len = strlen(buf); if (fwrite(buf, sizeof(gchar), len, fp) < len) { - g_warning("failed to dump %d bytes from file", len); + g_warning("failed to dump %zd bytes from file", len); fclose(infp); return -1; } @@ -2338,7 +2338,7 @@ static gint procmime_write_message_rfc822(MimeInfo *mimeinfo, FILE *fp) case MIMECONTENT_MEM: len = strlen(mimeinfo->data.mem); if (fwrite(mimeinfo->data.mem, sizeof(gchar), len, fp) < len) { - g_warning("failed to dump %d bytes from mem", len); + g_warning("failed to dump %zd bytes from mem", len); return -1; } break; @@ -2386,7 +2386,7 @@ static gint procmime_write_multipart(MimeInfo *mimeinfo, FILE *fp) break; len = strlen(buf); if (fwrite(buf, sizeof(gchar), len, fp) < len) { - g_warning("failed to write %d", len); + g_warning("failed to write %zd", len); fclose(infp); return -1; } @@ -2401,7 +2401,7 @@ static gint procmime_write_multipart(MimeInfo *mimeinfo, FILE *fp) *(str2 - 2) = '\0'; len = strlen(str); if (fwrite(str, sizeof(gchar), len, fp) < len) { - g_warning("failed to write %d from mem", len); + g_warning("failed to write %zd from mem", len); g_free(str); return -1; }