X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fber_oct.c;h=25829c10ee9076166e6a3c8203cf3ae2c426252a;hp=ad19db5ae7e61b4005a2afedf60ddc47100c1c69;hb=c82db01c9fc0b51254ec6ead5fe3b503ca098ca0;hpb=05c274ef315384faafcc5900c17468f0ea2474e6

diff --git a/src/ber_oct.c b/src/ber_oct.c
index ad19db5..25829c1 100644
--- a/src/ber_oct.c
+++ b/src/ber_oct.c
@@ -1,11 +1,9 @@
-/*
- * Copyright (c) 1995-2004, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
- *
- * $Id: ber_oct.c,v 1.2 2004-10-15 00:18:59 adam Exp $
  */
 
-/** 
+/**
  * \file ber_oct.c
  * \brief Implements ber_octetstring
  *
@@ -18,69 +16,95 @@
 #endif
 
 #include "odr-priv.h"
+#include <yaz/log.h>
+#include <assert.h>
 
 int ber_octetstring(ODR o, Odr_oct *p, int cons)
 {
     int res, len;
-    const unsigned char *base;
+    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)
-	{
-	    odr_seterror(o, OPROTO, 14);
-	    return 0;
-	}
-	o->bp += res;
-	if (cons)       /* fetch component strings */
-	{
-	    base = o->bp;
-	    while (odp_more_chunks(o, base, len))
-		if (!odr_octetstring(o, &p, 0, 0))
-		    return 0;
-	    return 1;
-	}
-	/* primitive octetstring */
-	if (len < 0)
-	{
-	    odr_seterror(o, OOTHER, 15);
-	    return 0;
-	}
-	if (len > odr_max(o))
-	{
-	    odr_seterror(o, OOTHER, 16);
-	    return 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';
-	return 1;
+        if ((res = ber_declen(o->bp, &len, odr_max(o))) < 0)
+        {
+            odr_seterror(o, OPROTO, 14);
+            return 0;
+        }
+        o->bp += res;
+        if (cons)       /* fetch component strings */
+        {
+            base = o->bp;
+            while (odp_more_chunks(o, base, len))
+                if (!odr_octetstring(o, &p, 0, 0))
+                    return 0;
+            return 1;
+        }
+        /* primitive octetstring */
+        if (len < 0)
+        {
+            odr_seterror(o, OOTHER, 15);
+            return 0;
+        }
+        if (len > odr_max(o))
+        {
+            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_write(o, p->buf, p->len) < 0)
-	    return 0;
-	return 1;
+        if ((res = ber_enclen(o, p->len, 5, 0)) < 0)
+            return 0;
+        if (p->len == 0)
+            return 1;
+        if (odr_write(o, p->buf, p->len) < 0)
+            return 0;
+        return 1;
     case ODR_PRINT:
-	return 1;
+        return 1;
     default:
-	odr_seterror(o, OOTHER, 17);
-	return 0;
+        odr_seterror(o, OOTHER, 17);
+        return 0;
     }
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+