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

diff --git a/odr/ber_oct.c b/odr/ber_oct.c
index 46e6297..86c4e5a 100644
--- a/odr/ber_oct.c
+++ b/odr/ber_oct.c
@@ -1,10 +1,22 @@
 /*
- * 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.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 +48,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)
     {
@@ -64,7 +77,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;