X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fber_oct.c;h=593cc119538f678f1e78907838e10ab0eb277b04;hp=a69219debd4684d47f2a68930de8320c69b380e3;hb=fb6d99a0c7e07d9cc4a315c447deaf6564a85505;hpb=67002f49611adb64993391b0cbf6c235f18080a4

diff --git a/src/ber_oct.c b/src/ber_oct.c
index a69219d..593cc11 100644
--- a/src/ber_oct.c
+++ b/src/ber_oct.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: ber_oct.c,v 1.3 2005-01-15 19:47:11 adam Exp $
+ * $Id: ber_oct.c,v 1.4 2005-06-25 15:46:03 adam Exp $
  */
 
 /** 
@@ -28,59 +28,67 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
     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 (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;
     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
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+