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
Use ZOOM_API for new function ZOOM_get_event_str
[yaz-moved-to-github.git]
/
src
/
odr_tag.c
diff --git
a/src/odr_tag.c
b/src/odr_tag.c
index
6c534fd
..
b3a6c99
100644
(file)
--- a/
src/odr_tag.c
+++ b/
src/odr_tag.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: odr_tag.c,v 1.4 2005-06-25 15:46:04 adam Exp $
*/
/**
* \file odr_tag.c
*/
/**
* \file odr_tag.c
@@
-21,7
+19,7
@@
int odr_peektag(ODR o, int *zclass, int *tag, int *cons)
odr_seterror(o, OOTHER, 48);
return 0;
}
odr_seterror(o, OOTHER, 48);
return 0;
}
- if (o->op->stackp > -1 && !odr_constructed_more(o))
+ if (ODR_STACK_NOT_EMPTY(o) && !odr_constructed_more(o))
return 0;
if (ber_dectag(o->bp, zclass, tag, cons, odr_max(o)) <= 0)
{
return 0;
if (ber_dectag(o->bp, zclass, tag, cons, odr_max(o)) <= 0)
{
@@
-35,10
+33,10
@@
int odr_implicit_settag(ODR o, int zclass, int tag)
{
if (o->error)
return 0;
{
if (o->error)
return 0;
- if (o->t_class < 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;
}
@@
-53,7
+51,7
@@
int odr_initmember(ODR o, void *p, int size)
*pp = (char *)odr_malloc(o, size);
else if (!*pp)
{
*pp = (char *)odr_malloc(o, size);
else if (!*pp)
{
- o->t_class = -1;
+ o->op->t_class = -1;
return 0;
}
return 1;
return 0;
}
return 1;