Goodbye to Odr_oct.size

[yaz-moved-to-github.git] / src / ber_oct.c

diff --git a/src/ber_oct.c b/src/ber_oct.c
index d86e414..5a36482 100644 (file)
--- 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,31 +52,11 @@ 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);
-        if (len + 1 > p->size - p->len)
-        {
-            c = (unsigned char *)odr_malloc(o, p->size += len + 1);
-            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;
-        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)