projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Function nmem_init only mandatory on Windows.
[yaz-moved-to-github.git]
/
odr
/
ber_oct.c
diff --git
a/odr/ber_oct.c
b/odr/ber_oct.c
index
af9d86d
..
86c4e5a
100644
(file)
--- a/
odr/ber_oct.c
+++ b/
odr/ber_oct.c
@@
-1,10
+1,16
@@
/*
/*
- * 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 $
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: ber_oct.c,v $
- * Revision 1.10 1995-09-29 17:12:18 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
* Smallish
*
* Revision 1.9 1995/09/27 15:02:55 quinn
@@
-42,7
+48,8
@@
int ber_octetstring(ODR o, Odr_oct *p, int cons)
{
int res, len;
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)
{
switch (o->direction)
{
@@
-70,7
+77,7
@@
int ber_octetstring(ODR o, Odr_oct *p, int cons)
}
if (len + 1 > p->size - p->len)
{
}
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;
if (p->len)
memcpy(c, p->buf, p->len);
p->buf = c;