X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=utf8%2Futf8.h;h=131dfbc3d245b6706ec23d207ec752a2fdc6b675;hb=8535a64e18dcc9b7cefb6d7d7e53de3cee58641e;hp=425b7a413f07d4f5ff42497c0d6c41c9bbe335e1;hpb=af581cf02cbbed0d24636be0b3533587448e7e0f;p=gedcom-parse.git

diff --git a/utf8/utf8.h b/utf8/utf8.h
index 425b7a4..131dfbc 100644
--- a/utf8/utf8.h
+++ b/utf8/utf8.h
@@ -16,20 +16,11 @@
 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;
-};
+#include <sys/types.h>
 
+struct conv_buffer;
+struct convert;
+typedef struct conv_buffer *conv_buffer_t;
 typedef struct convert *convert_t;
 
   /* Returns -1 if the string is not a valid UTF-8 string, returns its
@@ -39,14 +30,24 @@ int   utf8_strlen(const char* input);
   /* Returns 1 if string is valid UTF-8 string, 0 otherwise */
 int   is_utf8_string(const char* input);
 
+  /* Functions for creating and freeing conversion buffers yourself */
+conv_buffer_t create_conv_buffer(int size);
+void free_conv_buffer(conv_buffer_t buf);
+  
   /* General conversion interface (is bidirectional) */
-convert_t initialize_utf8_conversion(const char* charset);
+  /* Pass 0 for external_outbuf unless you want to control the
+     output buffer yourself */
+convert_t initialize_utf8_conversion(const char* charset, int external_outbuf);
 int   conversion_set_unknown(convert_t conv, const char* unknown);
+int   conversion_set_output_buffer(convert_t conv, conv_buffer_t buf);
 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);
+char* convert_to_utf8_incremental(convert_t conv,
+				  const char* input, size_t input_len);
 
-  /* Specific locale conversion interface */
+  /* Specific locale conversion interface (initializes a convert_t structure
+     implicitly */
 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);