X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=3b7566dac151a84ed114a0106f6c7b1cef3929b5;hp=dd44047d768b03909faa675338aba29e7d92548b;hb=95986f5aee1c2ee7d12c4b1e4bc47874856c5831;hpb=fdb93a08e305b8755260144807e4d45106a9cb9f

diff --git a/charset.h b/charset.h
index dd44047..3b7566d 100644
--- a/charset.h
+++ b/charset.h
@@ -32,60 +32,56 @@
 #  include "config.h"
 #endif
 
+#include <lib-lua/lib-lua.h>
+#include "charset.li"
+
 /****************************************************************************/
 /* charset functions                                                        */
 /****************************************************************************/
 
-extern char *Charset;
 extern int Charset_is_utf8;
 extern wchar_t CharsetReplacement;
 
-void charset_initialize(void);
 void charset_canonicalize(char *, ssize_t, const char *);
-int charset_is_utf8(const char *s);
-int charset_is_us_ascii(const char *s);
+int  charset_is_utf8(const char *);
+int  charset_is_us_ascii(const char *);
+const char *charset_getfirst(const char *);
 
 
 /****************************************************************************/
 /* iconv-line functions                                                     */
 /****************************************************************************/
 
-#ifdef HAVE_ICONV_H
-#  include <iconv.h>
+#define MUTT_ICONV_ERROR  ((iconv_t)(-1))
+
+#include <iconv.h>
 
 static inline ssize_t
 my_iconv(iconv_t ict, const char **in, ssize_t *il, char **out, ssize_t *ol) {
     return iconv(ict, (char **)in, (size_t*)il, out, (size_t*)ol);
 }
 
-#else
-#  define iconv_t              void*
-#  define iconv_open(a, b)     ((iconv_t)(-1))
-#  define my_iconv(a,b,c,d,e)  0
-#  define iconv_close(a)       0
-#endif
-
 #define M_ICONV_HOOK_FROM 1
 #define M_ICONV_HOOK_TO   2
 
-int mutt_convert_string (char **, const char *, const char *, int);
-const char *mutt_get_first_charset (const char *);
-int mutt_convert_nonmime_string (char **);
+iconv_t mutt_iconv_open(const char *, const char *, int);
+ssize_t mutt_iconv(iconv_t, const char **, ssize_t *, char **, ssize_t *,
+                   const char **, const char *);
 
-iconv_t mutt_iconv_open (const char *, const char *, int);
-ssize_t mutt_iconv (iconv_t, const char **, ssize_t *, char **, ssize_t *,
-                    const char **, const char *);
+int mutt_convert_string(char **, const char *, const char *, int);
+int mutt_convert_nonmime_string (char **);
 
 
 /****************************************************************************/
 /* fgetconv functions                                                       */
 /****************************************************************************/
 
-typedef void *FGETCONV;
+typedef struct fgetconv_t fgetconv_t;
+
+fgetconv_t *fgetconv_open(FILE *, const char *, const char *, int);
+void fgetconv_close(fgetconv_t **);
 
-FGETCONV *fgetconv_open (FILE *, const char *, const char *, int);
-int fgetconv (FGETCONV *);
-char *fgetconvs (char *, ssize_t, FGETCONV *);
-void fgetconv_close (FGETCONV **);
+int fgetconv(fgetconv_t *);
+char *fgetconvs(char *, ssize_t, fgetconv_t *);
 
 #endif /* _CHARSET_H */