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>
#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
#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 */