aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-mime-filter-charset.c4
-rw-r--r--camel/camel-mime-utils.c6
3 files changed, 11 insertions, 5 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 7014035ac9..373a80b8f2 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-14 Christopher James Lahey <clahey@ximian.com>
+
+ * camel-mime-filter-charset.c (complete, filter),
+ camel-mime-utils.c (rfc2047_decode_word, rfc2047_encode_word):
+ Changed this code to match the glibc iconv signature.
+
2001-02-14 Dan Winship <danw@ximian.com>
* camel-store.c (camel_store_create_folder): New method to create
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 a300700548..b9a8384f45 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -869,7 +869,7 @@ rfc2047_decode_word(const char *in, int len)
{
const char *inptr = in+2;
const char *inend = in+len-2;
- const char *inbuf;
+ char *inbuf;
char *encname;
int tmplen;
int ret;
@@ -1110,7 +1110,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));
@@ -1119,7 +1119,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);