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

diff --git a/src/ber_oct.c b/src/ber_oct.c
index 133a64b..ad19db5 100644
--- a/src/ber_oct.c
+++ b/src/ber_oct.c
@@ -1,10 +1,18 @@
 /*
- * Copyright (c) 1995-2003, Index Data
+ * Copyright (c) 1995-2004, Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  *
- * $Id: ber_oct.c,v 1.1 2003-10-27 12:21:30 adam Exp $
+ * $Id: ber_oct.c,v 1.2 2004-10-15 00:18:59 adam Exp $
  */
+
+/** 
+ * \file ber_oct.c
+ * \brief Implements ber_octetstring
+ *
+ * This source file implements BER encoding and decoding of
+ * the OCTETSTRING type.
+ */
+
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -19,57 +27,60 @@ 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';
+    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;
-    	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;
+	}
+	/* 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;
-    	case ODR_PRINT: return 1;
-    	default: odr_seterror(o, OOTHER, 17); return 0;
+	if (odr_write(o, p->buf, p->len) < 0)
+	    return 0;
+	return 1;
+    case ODR_PRINT:
+	return 1;
+    default:
+	odr_seterror(o, OOTHER, 17);
+	return 0;
     }
 }