X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Futf8.c;h=31e7e3b4e87999c3985845d166f75504bf437e9e;hp=b893e0d055d5476ff9d6a4242806843c8a94b12d;hb=c21a01f2a1dfff7f62636b251d4d129a9f0fbeec;hpb=cccb7ecd623450d5b3ca2391327788c84aed71c8

diff --git a/src/utf8.c b/src/utf8.c
index b893e0d..31e7e3b 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -1,12 +1,10 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
- *
- * $Id: siconv.c,v 1.50 2008-03-12 08:53:28 adam Exp $
  */
 /**
  * \file
- * \brief ISO-5428 character mapping (iconv)
+ * \brief UTF-8 encoding / decoding
  */
 
 #if HAVE_CONFIG_H
@@ -20,10 +18,11 @@
 
 #include "iconv-p.h"
 
-size_t yaz_init_UTF8(yaz_iconv_t cd, unsigned char *inp,
-                     size_t inbytesleft, size_t *no_read)
+static size_t init_utf8(yaz_iconv_t cd, yaz_iconv_decoder_t d,
+                        unsigned char *inp,
+                        size_t inbytesleft, size_t *no_read)
 {
-    if (inp[0] != 0xef)
+    if (!inp || inp[0] != 0xef)
     {
         *no_read = 0;
         return 0;
@@ -137,8 +136,9 @@ unsigned long yaz_read_UTF8_char(unsigned char *inp,
     return x;
 }
 
-unsigned long yaz_read_UTF8(yaz_iconv_t cd, unsigned char *inp,
-                            size_t inbytesleft, size_t *no_read)
+static unsigned long read_utf8(yaz_iconv_t cd, yaz_iconv_decoder_t d,
+                               unsigned char *inp,
+                               size_t inbytesleft, size_t *no_read)
 {
     int err = 0;
     int r = yaz_read_UTF8_char(inp, inbytesleft, no_read, &err);
@@ -147,8 +147,9 @@ unsigned long yaz_read_UTF8(yaz_iconv_t cd, unsigned char *inp,
 }
 
 
-size_t yaz_write_UTF8(yaz_iconv_t cd, unsigned long x,
-                      char **outbuf, size_t *outbytesleft)
+static size_t write_UTF8(yaz_iconv_t cd, yaz_iconv_encoder_t en,
+                             unsigned long x,
+                             char **outbuf, size_t *outbytesleft)
 {
     int err = 0;
     int r = yaz_write_UTF8_char(x, outbuf, outbytesleft, &err);
@@ -216,11 +217,37 @@ size_t yaz_write_UTF8_char(unsigned long x,
     return 0;
 }
 
+yaz_iconv_encoder_t yaz_utf8_encoder(const char *tocode,
+                                     yaz_iconv_encoder_t e)
+    
+{
+    if (!yaz_matchstr(tocode, "UTF8"))
+    {
+        e->write_handle = write_UTF8;
+        return e;
+    }
+    return 0;
+}
+
+yaz_iconv_decoder_t yaz_utf8_decoder(const char *fromcode,
+                                     yaz_iconv_decoder_t d)
+{
+    if (!yaz_matchstr(fromcode, "UTF8"))
+    {
+        d->init_handle = init_utf8;
+        d->read_handle = read_utf8;
+        return d;
+    }
+    return 0;
+}
+   
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+