Made conversion interface more general.

[gedcom-parse.git] / utf8 / utf8.h

diff --git a/utf8/utf8.h b/utf8/utf8.h
index 79836dd6d4aa265307fbcd143de342e46ca6c8e4..425b7a413f07d4f5ff42497c0d6c41c9bbe335e1 100644 (file)
--- a/utf8/utf8.h
+++ b/utf8/utf8.h
@@ -16,13 +16,37 @@
 extern "C" {
 #endif
 
+#include "iconv.h"
+
+struct conv_buffer {
+  char*   buffer;
+  size_t  size;
+};
+
+struct convert {
+  iconv_t from_utf8;
+  iconv_t to_utf8;
+  struct conv_buffer* outbuf;
+  char*   unknown;
+};
+
+typedef struct convert *convert_t;
+
   /* Returns -1 if the string is not a valid UTF-8 string, returns its
      string length otherwise */
 int   utf8_strlen(const char* input);
 
   /* Returns 1 if string is valid UTF-8 string, 0 otherwise */
 int   is_utf8_string(const char* input);
-  
+
+  /* General conversion interface (is bidirectional) */
+convert_t initialize_utf8_conversion(const char* charset);
+int   conversion_set_unknown(convert_t conv, const char* unknown);
+void  cleanup_utf8_conversion(convert_t conv);
+char* convert_from_utf8(convert_t conv, const char* input, int* conv_fails);
+char* convert_to_utf8(convert_t conv, const char* input);
+
+  /* Specific locale conversion interface */
 void  convert_set_unknown(const char* unknown);
 char* convert_utf8_to_locale(const char* input, int *conv_fails);
 char* convert_locale_to_utf8(const char* input);