diff options
| author | 5 <NotZed@Ximian.com> | 2001-10-26 08:37:52 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2001-10-26 08:37:52 +0800 |
| commit | 5b449d9ca73f3b7428f18c75af49d9d0cf8f36ce (patch) | |
| tree | e60b95d8f22e5b1408919f13f5965ba57082ea23 /camel/camel-mime-utils.c | |
| parent | b822bc381f5370d64329d8892c8745a8708b214c (diff) | |
| download | gsoc2013-evolution-5b449d9ca73f3b7428f18c75af49d9d0cf8f36ce.tar gsoc2013-evolution-5b449d9ca73f3b7428f18c75af49d9d0cf8f36ce.tar.gz gsoc2013-evolution-5b449d9ca73f3b7428f18c75af49d9d0cf8f36ce.tar.bz2 gsoc2013-evolution-5b449d9ca73f3b7428f18c75af49d9d0cf8f36ce.tar.lz gsoc2013-evolution-5b449d9ca73f3b7428f18c75af49d9d0cf8f36ce.tar.xz gsoc2013-evolution-5b449d9ca73f3b7428f18c75af49d9d0cf8f36ce.tar.zst gsoc2013-evolution-5b449d9ca73f3b7428f18c75af49d9d0cf8f36ce.zip | |
Remove the stupid warning that should never have been there in the first
2001-10-25 <NotZed@Ximian.com>
* camel-search-private.c (utf8_get): Remove the stupid warning
that should never have been there in the first place.
* camel-sasl-digest-md5.c (digest_response): s/iconv/e_iconv/
* camel-pgp-context.c (pgp_verify): "
* camel-mime-utils.c (rfc2047_decode_word, rfc2047_decode_word,
append_8bit, rfc2047_encode_word, rfc2184_decode,
header_decode_param): "
* camel-mime-part-utils.c (convert_buffer, convert_buffer): "
* camel-mime-filter-charset.c (reset, complete, filter): "
svn path=/trunk/; revision=14113
Diffstat (limited to 'camel/camel-mime-utils.c')
| -rw-r--r-- | camel/camel-mime-utils.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c index 706a1ff9c0..f0e1787f3f 100644 --- a/camel/camel-mime-utils.c +++ b/camel/camel-mime-utils.c @@ -1037,9 +1037,9 @@ rfc2047_decode_word(const char *in, int len) retry: ic = e_iconv_open ("UTF-8", charset); if (ic != (iconv_t)-1) { - ret = iconv (ic, &inbuf, &inlen, &outbuf, &outlen); + ret = e_iconv (ic, &inbuf, &inlen, &outbuf, &outlen); if (ret >= 0) { - iconv (ic, NULL, 0, &outbuf, &outlen); + e_iconv (ic, NULL, 0, &outbuf, &outlen); *outbuf = 0; decoded = g_strdup (outbase); } @@ -1116,7 +1116,7 @@ append_8bit (GString *out, const char *inbuf, int inlen, const char *charset) outlen = inlen * 6 + 16; outbuf = outbase = g_malloc(outlen); - if (iconv(ic, &inbuf, &inlen, &outbuf, &outlen) == -1) { + if (e_iconv(ic, &inbuf, &inlen, &outbuf, &outlen) == -1) { w(g_warning("Conversion to '%s' failed: %s", charset, strerror(errno))); g_free(outbase); e_iconv_close(ic); @@ -1267,13 +1267,13 @@ rfc2047_encode_word(GString *outstring, const char *in, int len, const char *typ hopefully-small-enough chunks, and leave it at that */ convlen = MIN(inlen, CAMEL_FOLD_PREENCODED); p = inptr; - if (iconv(ic, &inptr, &convlen, &out, &outlen) == -1) { + if (e_iconv(ic, &inptr, &convlen, &out, &outlen) == -1) { w(g_warning("Conversion problem: conversion truncated: %s", strerror(errno))); /* blah, we include it anyway, better than infinite loop ... */ inptr = p + convlen; } else { /* make sure we flush out any shift state */ - iconv(ic, NULL, 0, &out, &outlen); + e_iconv(ic, NULL, 0, &out, &outlen); } inlen -= (inptr - p); } @@ -1880,9 +1880,9 @@ rfc2184_decode (const char *in, int len) outlen = inlen * 6 + 16; outbuf = outbase = g_malloc (outlen); - ret = iconv (ic, &inbuf, &inlen, &outbuf, &outlen); + ret = e_iconv (ic, &inbuf, &inlen, &outbuf, &outlen); if (ret >= 0) { - iconv (ic, NULL, 0, &outbuf, &outlen); + e_iconv (ic, NULL, 0, &outbuf, &outlen); *outbuf = '\0'; g_free (decoded); decoded = outbase; @@ -2035,9 +2035,9 @@ header_decode_param (const char **in, char **paramp, char **valuep, int *is_rfc2 outlen = inlen * 6 + 16; outbuf = outbase = g_malloc (outlen); - ret = iconv (ic, &inbuf, &inlen, &outbuf, &outlen); + ret = e_iconv (ic, &inbuf, &inlen, &outbuf, &outlen); if (ret >= 0) { - iconv (ic, NULL, 0, &outbuf, &outlen); + e_iconv (ic, NULL, 0, &outbuf, &outlen); *outbuf = '\0'; } |