X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ficonv-p.h;h=805b827b58b81b568c9c9d0f02f2c55ee5654db5;hp=f9cc91e23332df4a62e10c996d7f5c197cdbb044;hb=5c0e243664a63c8522d400abbda6dc892cae4349;hpb=65f1b9fce2d1d86df7d75645fb46fbba32dd01e3

diff --git a/src/iconv-p.h b/src/iconv-p.h
index f9cc91e..805b827 100644
--- a/src/iconv-p.h
+++ b/src/iconv-p.h
@@ -1,11 +1,32 @@
-/*
- * Copyright (C) 2005-2008, Index Data ApS
- * See the file LICENSE for details.
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2010 Index Data.
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Index Data nor the names of its contributors
+ *       may be used to endorse or promote products derived from this
+ *       software without specific prior written permission.
  *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /**
  * \file
- * \brief Internal header for conv
+ * \brief Internal header for iconv
  */
 
 #ifndef ICONV_P_H
@@ -13,26 +34,11 @@
 
 #include <yaz/yconfig.h>
 
+#include <yaz/matchstr.h>
 #include <yaz/yaz-iconv.h>
 
 void yaz_iconv_set_errno(yaz_iconv_t cd, int no);
 
-unsigned long yaz_read_iso5428_1984(yaz_iconv_t cd, unsigned char *inp,
-                                    size_t inbytesleft, size_t *no_read);
-
-size_t yaz_init_UTF8(yaz_iconv_t cd, unsigned char *inp,
-                     size_t inbytesleft, size_t *no_read);
-unsigned long yaz_read_UTF8(yaz_iconv_t cd, unsigned char *inp,
-                            size_t inbytesleft, size_t *no_read);
-
-
-unsigned long yaz_read_UCS4(yaz_iconv_t cd, unsigned char *inp,
-                            size_t inbytesleft, size_t *no_read);
-unsigned long yaz_read_UCS4LE(yaz_iconv_t cd, unsigned char *inp,
-                              size_t inbytesleft, size_t *no_read);
-unsigned long yaz_read_advancegreek(yaz_iconv_t cd, unsigned char *inp,
-                                    size_t inbytesleft, size_t *no_read);
-
 typedef struct yaz_iconv_encoder_s *yaz_iconv_encoder_t;
 struct yaz_iconv_encoder_s {
     void *data;
@@ -69,10 +75,42 @@ int yaz_iso_8859_1_lookup_y(unsigned long v,
 int yaz_iso_8859_1_lookup_x12(unsigned long x1, unsigned long x2,
                               unsigned long *y);
 
+typedef struct yaz_iconv_decoder_s *yaz_iconv_decoder_t;
+struct yaz_iconv_decoder_s {
+    void *data;
+    size_t (*init_handle)(yaz_iconv_t cd, yaz_iconv_decoder_t d,
+                          unsigned char *inbuf,
+                          size_t inbytesleft, size_t *no_read);
+    unsigned long (*read_handle)(yaz_iconv_t cd, yaz_iconv_decoder_t d,
+                                 unsigned char *inbuf,
+                                 size_t inbytesleft, size_t *no_read);
+    void (*destroy_handle)(yaz_iconv_decoder_t d);
+};
+
+yaz_iconv_decoder_t yaz_marc8_decoder(const char *fromcode,
+                                      yaz_iconv_decoder_t d);
+yaz_iconv_decoder_t yaz_iso5426_decoder(const char *fromcode,
+                                      yaz_iconv_decoder_t d);
+yaz_iconv_decoder_t yaz_utf8_decoder(const char *fromcode,
+                                     yaz_iconv_decoder_t d);
+yaz_iconv_decoder_t yaz_ucs4_decoder(const char *tocode,
+                                     yaz_iconv_decoder_t d);
+yaz_iconv_decoder_t yaz_iso_8859_1_decoder(const char *fromcode,
+                                           yaz_iconv_decoder_t d);
+yaz_iconv_decoder_t yaz_iso_5428_decoder(const char *name,
+                                         yaz_iconv_decoder_t d);
+yaz_iconv_decoder_t yaz_advancegreek_decoder(const char *name,
+                                             yaz_iconv_decoder_t d);
+yaz_iconv_decoder_t yaz_wchar_decoder(const char *fromcode,
+				      yaz_iconv_decoder_t d);
+yaz_iconv_decoder_t yaz_danmarc_decoder(const char *fromcode,
+                                        yaz_iconv_decoder_t d);
+
 #endif
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab