Use good m_ functions, because it smell like a flower, version 2.

[apps/madmutt.git] / charset.h

diff --git a/charset.h b/charset.h
index dd44047..2f03c24 100644 (file)
--- a/charset.h
+++ b/charset.h
@@ -45,11 +45,15 @@ void charset_canonicalize(char *, ssize_t, const char *);
 int charset_is_utf8(const char *s);
 int charset_is_us_ascii(const char *s);
 
+const char *charset_getfirst(const char *);
+
 
 /****************************************************************************/
 /* iconv-line functions                                                     */
 /****************************************************************************/
 
+#define MUTT_ICONV_ERROR  ((iconv_t)(-1))
+
 #ifdef HAVE_ICONV_H
 #  include <iconv.h>
 
@@ -60,7 +64,7 @@ my_iconv(iconv_t ict, const char **in, ssize_t *il, char **out, ssize_t *ol) {
 
 #else
 #  define iconv_t              void*
-#  define iconv_open(a, b)     ((iconv_t)(-1))
+#  define iconv_open(a, b)     MUTT_ICONV_ERROR
 #  define my_iconv(a,b,c,d,e)  0
 #  define iconv_close(a)       0
 #endif
@@ -68,24 +72,24 @@ my_iconv(iconv_t ict, const char **in, ssize_t *il, char **out, ssize_t *ol) {
 #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 */