X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_oct.c;h=dee25a74addce52499a9b57d78de045f7dc3fd67;hb=8bccad6217bd2ba078106a531a9e73e7f3aae4a9;hp=008aaa10fddb21ad864f0125b99cbd0cfc61c508;hpb=569f86b4615c2731727be2a0ff898d36f9725819;p=yaz-moved-to-github.git

diff --git a/odr/odr_oct.c b/odr/odr_oct.c
index 008aaa1..dee25a7 100644
--- a/odr/odr_oct.c
+++ b/odr/odr_oct.c
@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 1995-2002, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: odr_oct.c,v 1.17 2002-07-25 12:51:08 adam Exp $
+ * $Id: odr_oct.c,v 1.21 2003-03-11 11:03:31 adam Exp $
  */
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -57,7 +57,7 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
     }
     if (ber_octetstring(o, *p, cons))
     	return 1;
-    o->error = OOTHER;
+    odr_seterror(o, OOTHER, 43);
     return 0;
 }
 
@@ -137,27 +137,26 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
     if (o->direction == ODR_ENCODE)
     {
         t->buf = 0;
-#if HAVE_ICONV_H
-        if (o->op->iconv_handle != (iconv_t)(-1))
+
+        if (o->op->iconv_handle != 0)
         {
             size_t inleft = strlen(*p);
             char *inbuf = *p;
             size_t outleft = 4 * inleft + 2;
-            char *outbuf = odr_malloc (o, outleft);
+            char *outbuf = (char *) odr_malloc (o, outleft);
             size_t ret;
             
-            t->buf = outbuf;
+            t->buf = (unsigned char *) outbuf;
             
-            ret = iconv (o->op->iconv_handle, &inbuf, &inleft,
-                         &outbuf, &outleft);
+            ret = yaz_iconv (o->op->iconv_handle, &inbuf, &inleft,
+                             &outbuf, &outleft);
             if (ret == (size_t)(-1))
             {
-                o->error = ODATA;
+                odr_seterror(o, ODATA, 44);
                 return 0;
             }
             t->size = t->len = outbuf - (char*) t->buf;
         }
-#endif
         if (!t->buf)
         {
             t->buf = (unsigned char *) *p;
@@ -175,29 +174,28 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
     if (o->direction == ODR_DECODE)
     {
         *p = 0;
-#if HAVE_ICONV_H
-        if (o->op->iconv_handle != (iconv_t)(-1))
+
+        if (o->op->iconv_handle != 0)
         {
             size_t inleft = t->len;
-            char *inbuf = t->buf;
+            char *inbuf = (char *) t->buf;
             size_t outleft = 4 * inleft + 2;
-            char *outbuf = odr_malloc (o, outleft);
+            char *outbuf = (char *) odr_malloc (o, outleft);
             size_t ret;
 
             *p = outbuf;
             
-            ret = iconv (o->op->iconv_handle, &inbuf, &inleft,
-                         &outbuf, &outleft);
+            ret = yaz_iconv (o->op->iconv_handle, &inbuf, &inleft,
+                             &outbuf, &outleft);
             if (ret == (size_t)(-1))
             {
-                o->error = ODATA;
+                odr_seterror(o, ODATA, 45);
                 return 0;
             }
             inleft = outbuf - (char*) *p;
             
             (*p)[inleft] = '\0';    /* null terminate it */
         }
-#endif
         if (!*p)
         {
             *p = (char *) t->buf;