diff options
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/camel-mime-filter-charset.c | 4 | ||||
| -rw-r--r-- | camel/camel-mime-utils.c | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 49d31e26a7..2a05238ce1 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2001-02-06 Christopher James Lahey <clahey@ximian.com> + + * camel-mime-filter-charset.c (complete, filter), + camel-mime-utils.c (rfc2047_decode_word, rfc2047_encode_word): + Made these pass char ** as the second parameter to iconv. + 2001-02-06 Not Zed <NotZed@Ximian.com> * camel-search-private.c: Removed unwanted header. It was never diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c index 6c1f668713..a45a318367 100644 --- a/camel/camel-mime-filter-charset.c +++ b/camel/camel-mime-filter-charset.c @@ -85,7 +85,7 @@ complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, { CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf; int converted; - const char *inbuf; + char *inbuf; char *outbuf; int inlen, outlen; @@ -151,7 +151,7 @@ filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, s { CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf; int converted; - const char *inbuf; + char *inbuf; char *outbuf; int inlen, outlen; diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c index 7b63baae14..ab41258582 100644 --- a/camel/camel-mime-utils.c +++ b/camel/camel-mime-utils.c @@ -925,7 +925,7 @@ rfc2047_decode_word(const char *in, int len) /* TODO: Should this cache iconv converters? */ ic = iconv_open("UTF-8", encname); if (ic != (iconv_t)-1) { - ret = iconv(ic, (const char **)&inbuf, &inlen, &outbuf, &outlen); + ret = iconv(ic, &inbuf, &inlen, &outbuf, &outlen); if (ret>=0) { iconv(ic, NULL, 0, &outbuf, &outlen); *outbuf = 0; @@ -1109,7 +1109,7 @@ rfc2047_encode_word(GString *outstring, const char *in, int len, const char *typ iconv_t ic = (iconv_t *)-1; char *buffer, *out, *ascii; size_t inlen, outlen, enclen, bufflen; - const char *inptr, *p; + char *inptr, *p; int first = 1; d(printf("Converting [%d] '%.*s' to %s\n", len, len, in, type)); @@ -1118,7 +1118,7 @@ rfc2047_encode_word(GString *outstring, const char *in, int len, const char *typ bufflen = len*6+16; buffer = alloca(bufflen); inlen = len; - inptr = in; + inptr = (char *) in; ascii = alloca(bufflen); |