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

diff --git a/src/ber_oct.c b/src/ber_oct.c
index 1f547bf..5a36482 100644
--- a/src/ber_oct.c
+++ b/src/ber_oct.c
@@ -23,9 +23,6 @@ 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)
     {
@@ -55,41 +52,18 @@ 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
         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: