diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-06-05 20:48:29 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-06-09 19:18:28 +0800 |
| commit | b0e26e9c5f13c710c7677959cc457158206befe1 (patch) | |
| tree | b4a7791f26ff0928e862d9d44b3b81e52cd986e0 /em-format | |
| parent | f9f7c3efa62b85e8f54e59382fef9ef8c80df6e6 (diff) | |
| download | gsoc2013-evolution-b0e26e9c5f13c710c7677959cc457158206befe1.tar gsoc2013-evolution-b0e26e9c5f13c710c7677959cc457158206befe1.tar.gz gsoc2013-evolution-b0e26e9c5f13c710c7677959cc457158206befe1.tar.bz2 gsoc2013-evolution-b0e26e9c5f13c710c7677959cc457158206befe1.tar.lz gsoc2013-evolution-b0e26e9c5f13c710c7677959cc457158206befe1.tar.xz gsoc2013-evolution-b0e26e9c5f13c710c7677959cc457158206befe1.tar.zst gsoc2013-evolution-b0e26e9c5f13c710c7677959cc457158206befe1.zip | |
Fix even more compiler warnings and disable one for format strings
Diffstat (limited to 'em-format')
| -rw-r--r-- | em-format/em-format-quote.c | 7 | ||||
| -rw-r--r-- | em-format/em-stripsig-filter.c | 12 |
2 files changed, 9 insertions, 10 deletions
diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c index bb56670f24..88b11c3ac2 100644 --- a/em-format/em-format-quote.c +++ b/em-format/em-format-quote.c @@ -188,7 +188,7 @@ emfq_format_error(EMFormat *emf, CamelStream *stream, const gchar *txt) static void emfq_format_text_header (EMFormatQuote *emfq, CamelStream *stream, const gchar *label, const gchar *value, guint32 flags, gint is_html) { - const gchar *fmt, *html; + const gchar *html; gchar *mhtml = NULL; if (value == NULL) @@ -203,11 +203,10 @@ emfq_format_text_header (EMFormatQuote *emfq, CamelStream *stream, const gchar * html = value; if (flags & EM_FORMAT_HEADER_BOLD) - fmt = "<b>%s</b>: %s<br>"; + camel_stream_printf (stream, "<b>%s</b>: %s<br>", label, html); else - fmt = "%s: %s<br>"; + camel_stream_printf (stream, "%s: %s<br>", label, html); - camel_stream_printf (stream, fmt, label, html); g_free (mhtml); } diff --git a/em-format/em-stripsig-filter.c b/em-format/em-stripsig-filter.c index 65400027ff..f4097a1b3d 100644 --- a/em-format/em-stripsig-filter.c +++ b/em-format/em-stripsig-filter.c @@ -34,9 +34,9 @@ static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass); static void em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass); -static void filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, +static void filter_filter (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace); -static void filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, +static void filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace); static void filter_reset (CamelMimeFilter *filter); @@ -83,7 +83,7 @@ em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass) } static void -strip_signature (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, +strip_signature (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace, gint flush) { EMStripSigFilter *stripsig = (EMStripSigFilter *) filter; @@ -126,20 +126,20 @@ strip_signature (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, else if (!start) inptr = inend; - *out = in; + *out = (gchar*)in; *outlen = inptr - in; *outprespace = prespace; } static void -filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, +filter_filter (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace) { strip_signature (filter, in, len, prespace, out, outlen, outprespace, FALSE); } static void -filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, +filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace) { strip_signature (filter, in, len, prespace, out, outlen, outprespace, TRUE); |