X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fber_oct.c;h=6fde92022ecf97d3515208f10f18a232a809c3bb;hb=a19243ec18959150a30c63c521fc5b0af860ce18;hp=46e6297e778943dd35009481d0a470a65f45cfc3;hpb=99268f722648e84bf5c54eb685a1434e100f38a1;p=yaz-moved-to-github.git

diff --git a/odr/ber_oct.c b/odr/ber_oct.c
index 46e6297..6fde920 100644
--- a/odr/ber_oct.c
+++ b/odr/ber_oct.c
@@ -1,10 +1,26 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: ber_oct.c,v $
- * Revision 1.8  1995-05-16 08:50:47  quinn
+ * Revision 1.13  1999-04-20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.12  1999/01/08 11:23:24  adam
+ * Added const modifier to some of the BER/ODR encoding routines.
+ *
+ * Revision 1.11  1998/02/11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.10  1995/09/29 17:12:18  quinn
+ * Smallish
+ *
+ * Revision 1.9  1995/09/27  15:02:55  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.8  1995/05/16  08:50:47  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.7  1995/04/18  08:15:17  quinn
@@ -36,7 +52,8 @@
 int ber_octetstring(ODR o, Odr_oct *p, int cons)
 {
     int res, len;
-    unsigned char *base, *c;
+    const unsigned char *base;
+    unsigned char *c;
 
     switch (o->direction)
     {
@@ -52,7 +69,7 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
 	    {
 	    	base = o->bp;
 	    	while (odp_more_chunks(o, base, len))
-		    if (!odr_octetstring(o, &p, 0))
+		    if (!odr_octetstring(o, &p, 0, 0))
 		    	return 0;
 		return 1;
 	    }
@@ -64,7 +81,7 @@ int ber_octetstring(ODR o, Odr_oct *p, int cons)
 	    }
 	    if (len + 1 > p->size - p->len)
 	    {
-	    	c = odr_malloc(o, p->size += len + 1);
+	    	c = (unsigned char *)odr_malloc(o, p->size += len + 1);
 	    	if (p->len)
 		    memcpy(c, p->buf, p->len);
 		p->buf = c;