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
Version 5.7.3
[yaz-moved-to-github.git]
/
src
/
ber_int.c
diff --git
a/src/ber_int.c
b/src/ber_int.c
index
7717c07
..
40dbb0c
100644
(file)
--- a/
src/ber_int.c
+++ b/
src/ber_int.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
@@
-37,12
+37,12
@@
int ber_integer(ODR o, Odr_int *val)
switch (o->direction)
{
case ODR_DECODE:
switch (o->direction)
{
case ODR_DECODE:
- if ((res = ber_decinteger(o->bp, val, odr_max(o))) <= 0)
+ if ((res = ber_decinteger(o->op->bp, val, odr_max(o))) <= 0)
{
odr_seterror(o, OPROTO, 50);
return 0;
}
{
odr_seterror(o, OPROTO, 50);
return 0;
}
- o->bp += res;
+ o->op->bp += res;
return 1;
case ODR_ENCODE:
if ((res = ber_encinteger(o, *val)) < 0)
return 1;
case ODR_ENCODE:
if ((res = ber_encinteger(o, *val)) < 0)
@@
-66,7
+66,7
@@
int ber_encinteger(ODR o, Odr_int val)
size_t i;
for (i = sizeof(uval); i > 0; )
{
size_t i;
for (i = sizeof(uval); i > 0; )
{
- tmp[--i] = uval;
+ tmp[--i] = (unsigned char ) uval; /* only want lower 8 bits */
uval >>= 8;
}
for (i = 0; i < sizeof(uval)-1; i++)
uval >>= 8;
}
for (i = 0; i < sizeof(uval)-1; i++)
@@
-77,7
+77,7
@@
int ber_encinteger(ODR o, Odr_int val)
len = sizeof(uval) - i;
if (ber_enclen(o, len, 1, 1) != 1)
return -1;
len = sizeof(uval) - i;
if (ber_enclen(o, len, 1, 1) != 1)
return -1;
- if (odr_write2(o, (const char *) tmp + i, len) < 0)
+ if (odr_write(o, (const char *) tmp + i, len) < 0)
return -1;
return 0;
}
return -1;
return 0;
}