X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fber_oct.c;h=a88da376f8aa1f3461aa3f5bc6a5ff94c9865c6e;hp=1f547bf8193487f3420865054c61fccbbc48746e;hb=eb467c75687daef0419eb95f652693ca00c60195;hpb=69b1d8e7b437179163fe97b7cbead51a56835f2a

diff --git a/src/ber_oct.c b/src/ber_oct.c
index 1f547bf..a88da37 100644
--- a/src/ber_oct.c
+++ b/src/ber_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.
  */
 
@@ -23,22 +23,19 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
 {
     int res, len;
     const char *base;
-#if OCT_SIZE
-    unsigned char *c;
-#endif
 
     switch (o->direction)
     {
     case ODR_DECODE:
-        if ((res = ber_declen(o->bp, &len, odr_max(o))) < 0)
+        if ((res = ber_declen(o->op->bp, &len, odr_max(o))) < 0)
         {
             odr_seterror(o, OPROTO, 14);
             return 0;
         }
-        o->bp += res;
+        o->op->bp += res;
         if (cons)       /* fetch component strings */
         {
-            base = o->bp;
+            base = o->op->bp;
             while (odp_more_chunks(o, base, len))
                 if (!odr_octetstring(o, &p, 0, 0))
                     return 0;
@@ -55,41 +52,16 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
             odr_seterror(o, OOTHER, 16);
             return 0;
         }
-#if OCT_SIZE
-        assert(p->size == 0);
-        assert(p->len == 0);
-        yaz_log(YLOG_LOG, "DECODE OCTET1 p->size=%d p->len=%d", p->size, p->len);
-        if (len + 1 > p->size - p->len)
-        {
-            c = (unsigned char *)odr_malloc(o, p->size += len + 1);
-            yaz_log(YLOG_LOG, "DECODE COPY p->size=%d p->len=%d", p->size, p->len);
-            if (p->len)
-                memcpy(c, p->buf, p->len);
-            p->buf = c;
-        }
-        if (len)
-            memcpy(p->buf + p->len, o->bp, len);
-        p->len += len;
-        yaz_log(YLOG_LOG, "DECODE OCTET2 p->size=%d p->len=%d", p->size, p->len);
-        o->bp += len;
-        /* the final null is really not part of the buffer, but */
-        /* it helps somes applications that assumes C strings */
-        if (len)
-            p->buf[p->len] = '\0';
-#else
         p->len = len;
-        p->buf = odr_malloc(o, len + 1);
-        memcpy(p->buf, o->bp, len);
-        p->buf[len] = '\0';
-        o->bp += len;
-#endif
+        p->buf = odr_strdupn(o, o->op->bp, len);
+        o->op->bp += len;
         return 1;
     case ODR_ENCODE:
         if ((res = ber_enclen(o, p->len, 5, 0)) < 0)
             return 0;
         if (p->len == 0)
             return 1;
-        if (odr_write2(o, p->buf, p->len) < 0)
+        if (odr_write(o, p->buf, p->len) < 0)
             return 0;
         return 1;
     case ODR_PRINT: