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
For OIDs use Odr_oid type everywhere, i.e. do not assume Odr_oid=int.
[yaz-moved-to-github.git]
/
src
/
odr_tag.c
diff --git
a/src/odr_tag.c
b/src/odr_tag.c
index
c0c569d
..
ba83507
100644
(file)
--- a/
src/odr_tag.c
+++ b/
src/odr_tag.c
@@
-1,8
+1,8
@@
/*
/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: odr_tag.c,v 1.3 2005-01-15 19:47:14 adam Exp $
+ * $Id: odr_tag.c,v 1.7 2007-03-19 21:08:13 adam Exp $
*/
/**
* \file odr_tag.c
*/
/**
* \file odr_tag.c
@@
-19,14
+19,14
@@
int odr_peektag(ODR o, int *zclass, int *tag, int *cons)
if (o->direction != ODR_DECODE)
{
odr_seterror(o, OOTHER, 48);
if (o->direction != ODR_DECODE)
{
odr_seterror(o, OOTHER, 48);
- return 0;
+ return 0;
}
}
- if (o->op->stackp > -1 && !odr_constructed_more(o))
- return 0;
+ if (ODR_STACK_NOT_EMPTY(o) && !odr_constructed_more(o))
+ return 0;
if (ber_dectag(o->bp, zclass, tag, cons, odr_max(o)) <= 0)
{
odr_seterror(o, OREQUIRED, 49);
if (ber_dectag(o->bp, zclass, tag, cons, odr_max(o)) <= 0)
{
odr_seterror(o, OREQUIRED, 49);
- return 0;
+ return 0;
}
return 1;
}
}
return 1;
}
@@
-34,11
+34,11
@@
int odr_peektag(ODR o, int *zclass, int *tag, int *cons)
int odr_implicit_settag(ODR o, int zclass, int tag)
{
if (o->error)
int odr_implicit_settag(ODR o, int zclass, int tag)
{
if (o->error)
- return 0;
- if (o->t_class < 0)
+ return 0;
+ if (o->op->t_class < 0)
{
{
- o->t_class = zclass;
- o->t_tag = tag;
+ o->op->t_class = zclass;
+ o->op->t_tag = tag;
}
return 1;
}
}
return 1;
}
@@
-48,13
+48,21
@@
int odr_initmember(ODR o, void *p, int size)
char **pp = (char **) p;
if (o->error)
char **pp = (char **) p;
if (o->error)
- return 0;
+ return 0;
if (o->direction == ODR_DECODE)
if (o->direction == ODR_DECODE)
- *pp = (char *)odr_malloc(o, size);
+ *pp = (char *)odr_malloc(o, size);
else if (!*pp)
{
else if (!*pp)
{
- o->t_class = -1;
- return 0;
+ o->op->t_class = -1;
+ return 0;
}
return 1;
}
}
return 1;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+