X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_oct.c;h=a64648a606ab2ca6f5cf3d33a8228f05ef67221e;hp=ae623cf3647b9d8a49f49ee39d5845db002ffa14;hb=69b1d8e7b437179163fe97b7cbead51a56835f2a;hpb=379504a233e3e2cc85bca1e7b6d864f1395aec7c

diff --git a/src/odr_oct.c b/src/odr_oct.c
index ae623cf..a64648a 100644
--- a/src/odr_oct.c
+++ b/src/odr_oct.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -45,7 +45,9 @@ int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
     if (o->direction == ODR_DECODE)
     {
         *p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
+#if OCT_SIZE
         (*p)->size= 0;
+#endif
         (*p)->len = 0;
         (*p)->buf = 0;
     }
@@ -84,12 +86,17 @@ int odr_cstring(ODR o, char **p, int opt, const char *name)
     t = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct)); /* wrapper for octstring */
     if (o->direction == ODR_ENCODE)
     {
-        t->buf = (unsigned char *) *p;
-        t->size = t->len = strlen(*p);
+        t->buf = *p;
+        t->len = strlen(*p);
+#if OCT_SIZE
+        t->size = t->len;
+#endif
     }
     else
     {
+#if OCT_SIZE
         t->size= 0;
+#endif
         t->len = 0;
         t->buf = 0;
     }
@@ -141,9 +148,9 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
             size_t outleft = 4 * inleft + 2;
             char *outbuf = (char *) odr_malloc (o, outleft);
             size_t ret;
-            
-            t->buf = (unsigned char *) outbuf;
-            
+
+            t->buf = outbuf;
+
             ret = yaz_iconv(o->op->iconv_handle, &inbuf, &inleft,
                             &outbuf, &outleft);
             if (ret == (size_t)(-1))
@@ -159,17 +166,25 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
                 odr_seterror(o, ODATA, 44);
                 return 0;
             }
-            t->size = t->len = outbuf - (char*) t->buf;
+            t->len = outbuf - (char*) t->buf;
+#if OCT_SIZE
+            t->size = t->len;
+#endif
         }
         if (!t->buf)
         {
-            t->buf = (unsigned char *) *p;
-            t->size = t->len = strlen(*p);
+            t->buf = *p;
+            t->len = strlen(*p);
+#if OCT_SIZE
+            t->size = t->len;
+#endif
         }
     }
     else
     {
+#if OCT_SIZE
         t->size= 0;
+#endif
         t->len = 0;
         t->buf = 0;
     }
@@ -188,7 +203,7 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
             size_t ret;
 
             *p = outbuf;
-            
+
             ret = yaz_iconv (o->op->iconv_handle, &inbuf, &inleft,
                              &outbuf, &outleft);
             if (ret == (size_t)(-1))
@@ -204,7 +219,7 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
                 return 0;
             }
             inleft = outbuf - (char*) *p;
-            
+
             (*p)[inleft] = '\0';    /* null terminate it */
         }
         if (!*p)