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
yaz-iconv: fix typos
[yaz-moved-to-github.git]
/
src
/
ber_oid.c
diff --git
a/src/ber_oid.c
b/src/ber_oid.c
index
4307b06
..
fef26ea
100644
(file)
--- a/
src/ber_oid.c
+++ b/
src/ber_oid.c
@@
-1,9
+1,9
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
-/**
+/**
* \file ber_oid.c
* \brief Implements BER OID encoding and decoding
*
* \file ber_oid.c
* \brief Implements BER OID encoding and decoding
*
@@
-25,7
+25,7
@@
int ber_oidc(ODR o, Odr_oid *p, int max_oid_size)
switch (o->direction)
{
case ODR_DECODE:
switch (o->direction)
{
case ODR_DECODE:
- if ((res = ber_declen(o->bp, &len, odr_max(o))) < 1)
+ if ((res = ber_declen(o->op->bp, &len, odr_max(o))) < 1)
{
odr_seterror(o, OPROTO, 18);
return 0;
{
odr_seterror(o, OPROTO, 18);
return 0;
@@
-35,7
+35,7
@@
int ber_oidc(ODR o, Odr_oid *p, int max_oid_size)
odr_seterror(o, OPROTO, 19);
return 0;
}
odr_seterror(o, OPROTO, 19);
return 0;
}
- o->bp += res;
+ o->op->bp += res;
if (len > odr_max(o))
{
odr_seterror(o, OPROTO, 20);
if (len > odr_max(o))
{
odr_seterror(o, OPROTO, 20);
@@
-53,10
+53,10
@@
int ber_oidc(ODR o, Odr_oid *p, int max_oid_size)
return 0;
}
id <<= 7;
return 0;
}
id <<= 7;
- id |= *o->bp & 0X7F;
+ id |= *o->op->bp & 0X7F;
len--;
}
len--;
}
- while (*(o->bp++) & 0X80);
+ while (*(o->op->bp++) & 0X80);
if (id < 0)
{
if (id < 0)
{
@@
-102,7
+102,7
@@
int ber_oidc(ODR o, Odr_oid *p, int max_oid_size)
n = 0;
if (pos == 1)
id = p[0]*40 + p[1];
n = 0;
if (pos == 1)
id = p[0]*40 + p[1];
- else
+ else
id = p[pos];
do
{
id = p[pos];
do
{
@@
-128,7
+128,7
@@
int ber_oidc(ODR o, Odr_oid *p, int max_oid_size)
}
odr_seek(o, ODR_S_END, 0);
return 1;
}
odr_seek(o, ODR_S_END, 0);
return 1;
- default:
+ default:
odr_seterror(o, OOTHER, 22);
return 0;
}
odr_seterror(o, OOTHER, 22);
return 0;
}
@@
-136,6
+136,7
@@
int ber_oidc(ODR o, Odr_oid *p, int max_oid_size)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab