X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=fd85199bb41580211b7f27c7ba8bcdd604655418;hp=5b3b732f75f9795059729fdbd2246a551089bcd2;hb=29bfa77fef6bf9c0bba878257fc837b2e75f8256;hpb=83532821ae9fab034d0d630b78330c9ea4ff4cf3 diff --git a/charset.h b/charset.h index 5b3b732..fd85199 100644 --- a/charset.h +++ b/charset.h @@ -29,10 +29,10 @@ typedef void *iconv_t; # define my_iconv(a,b,c,d,e) 0 # define iconv_close(a) 0 #else -static inline ssize_t my_iconv(iconv_t ict, const char **inbuf, size_t *ilen, - char **outbuf, size_t *olen) +static inline ssize_t my_iconv(iconv_t ict, const char **inbuf, ssize_t *ilen, + char **outbuf, ssize_t *olen) { - return iconv(ict, (char **)inbuf, ilen, outbuf, olen); + return iconv(ict, (char **)inbuf, (size_t*)ilen, outbuf, (size_t*)olen); } #endif @@ -41,14 +41,14 @@ const char *mutt_get_first_charset (const char *); int mutt_convert_nonmime_string (char **); iconv_t mutt_iconv_open (const char *, const char *, int); -size_t mutt_iconv (iconv_t, const char **, size_t *, char **, size_t *, - const char **, const char *); +ssize_t mutt_iconv (iconv_t, const char **, ssize_t *, char **, ssize_t *, + const char **, const char *); typedef void *FGETCONV; FGETCONV *fgetconv_open (FILE *, const char *, const char *, int); int fgetconv (FGETCONV *); -char *fgetconvs (char *, size_t, FGETCONV *); +char *fgetconvs (char *, ssize_t, FGETCONV *); void fgetconv_close (FGETCONV **); void mutt_set_langinfo_charset (void); @@ -56,4 +56,9 @@ void mutt_set_langinfo_charset (void); #define M_ICONV_HOOK_FROM 1 #define M_ICONV_HOOK_TO 2 +extern int Charset_is_utf8; + +void mutt_set_charset(char *charset); +wchar_t replacement_char(void); + #endif /* _CHARSET_H */