X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.h;h=2f03c24bcfd69d4ab8115a1eadeb009997d390cb;hp=b27a5c6c9aad71ca8c26750704bf17a2c80cf167;hb=8e075eda08c6f099ec6988e16607fb4f6a10ba92;hpb=d6e1782b1e788bd1c4767443712bf1713cc013ef

diff --git a/charset.h b/charset.h
index b27a5c6..2f03c24 100644
--- a/charset.h
+++ b/charset.h
@@ -1,3 +1,21 @@
+/*
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or (at
+ *  your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA 02110-1301, USA.
+ *
+ *  Copyright © 2006 Pierre Habouzit
+ */
 /*
  * Copyright notice from original mutt:
  * Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
@@ -14,19 +32,28 @@
 #  include "config.h"
 #endif
 
-
-#define M_ICONV_HOOK_FROM 1
-#define M_ICONV_HOOK_TO   2
+/****************************************************************************/
+/* charset functions                                                        */
+/****************************************************************************/
 
 extern char *Charset;
 extern int Charset_is_utf8;
+extern wchar_t CharsetReplacement;
 
 void charset_initialize(void);
-void mutt_canonical_charset(char *, ssize_t, const char *);
-
+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>
 
@@ -37,26 +64,32 @@ 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
 
-int mutt_convert_string (char **, const char *, const char *, int);
-const char *mutt_get_first_charset (const char *);
+#define M_ICONV_HOOK_FROM 1
+#define M_ICONV_HOOK_TO   2
+
+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 **);
 
-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 *);
 
-typedef void *FGETCONV;
+/****************************************************************************/
+/* fgetconv functions                                                       */
+/****************************************************************************/
+
+typedef struct fgetconv_t fgetconv_t;
 
-FGETCONV *fgetconv_open (FILE *, const char *, const char *, int);
-int fgetconv (FGETCONV *);
-char *fgetconvs (char *, ssize_t, FGETCONV *);
-void fgetconv_close (FGETCONV **);
+fgetconv_t *fgetconv_open(FILE *, const char *, const char *, int);
+void fgetconv_close(fgetconv_t **);
 
-wchar_t replacement_char(void);
+int fgetconv(fgetconv_t *);
+char *fgetconvs(char *, ssize_t, fgetconv_t *);
 
 #endif /* _CHARSET_H */