/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995-1999, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_oct.c,v $
- * Revision 1.7 1995-04-18 08:15:17 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
* Added dynamic memory allocation on encoding (whew). Code is now somewhat
* neater. We'll make the same change for decoding one day.
*
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)
{
{
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;
}
}
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;