X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_oct.c;h=d9c35a81f53f9840c116d63d41b577de437793db;hp=fc065191f8983bc7aa6f14fa05bf5ec0006c3f0b;hb=b41eafb39bc0ee50b4c5988f5ecfc6aad91933d5;hpb=cabcc223cd47503763e7c42969e3be30c58276af

diff --git a/src/odr_oct.c b/src/odr_oct.c
index fc06519..d9c35a8 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-2013 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -45,9 +45,6 @@ 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;
     }
@@ -86,17 +83,11 @@ 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->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;
     }
@@ -149,7 +140,7 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
             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);
@@ -167,24 +158,15 @@ int odr_iconv_string(ODR o, char **p, int opt, const char *name)
                 return 0;
             }
             t->len = outbuf - (char*) t->buf;
-#if OCT_SIZE
-            t->size = t->len;
-#endif
         }
         if (!t->buf)
         {
-            t->buf = (unsigned char *) *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;
     }