X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fdecode.c;h=cf64886eeff85ff8ce0c11b7b55157e5493efdf8;hb=3343e92810bc5ec3f3602cf41dc64f7480be4d28;hp=4e72f191d924c88c1c5be846e2fc0f0a8916b877;hpb=de3241f3927abe86a679be13fccad5bdefb756b0;p=citadel.git diff --git a/webcit/decode.c b/webcit/decode.c index 4e72f191d..cf64886ee 100644 --- a/webcit/decode.c +++ b/webcit/decode.c @@ -8,7 +8,7 @@ * * tocode Target encoding * fromcode Source encoding - */ + * / iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode) { iconv_t ic = (iconv_t)(-1) ; @@ -24,7 +24,7 @@ iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode) } return(ic); } - +*/ inline char *FindNextEnd (char *bptr) @@ -83,7 +83,7 @@ void utf8ify_rfc822_string(char *buf) { get_preference("default_header_charset", &default_header_charset); if ( (strcasecmp(ChrPtr(default_header_charset), "UTF-8")) && (strcasecmp(ChrPtr(default_header_charset), "us-ascii")) ) { - ic = ctdl_iconv_open("UTF-8", ChrPtr(default_header_charset)); + ctdl_iconv_open("UTF-8", ChrPtr(default_header_charset), &ic); if (ic != (iconv_t)(-1) ) { ibuf = malloc(1024); isav = ibuf; @@ -184,7 +184,7 @@ void utf8ify_rfc822_string(char *buf) { ibuflen = strlen(istr); } - ic = ctdl_iconv_open("UTF-8", charset); + ctdl_iconv_open("UTF-8", charset, &ic); if (ic != (iconv_t)(-1) ) { obuflen = 1024; obuf = (char *) malloc(obuflen);