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
Modified makefile to use common lib
[yaz-moved-to-github.git]
/
odr
/
odr_seq.c
diff --git
a/odr/odr_seq.c
b/odr/odr_seq.c
index
f135d85
..
df8e124
100644
(file)
--- a/
odr/odr_seq.c
+++ b/
odr/odr_seq.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_seq.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_seq.c,v $
- * Revision 1.5 1995-02-09 15:51:49 quinn
+ * Revision 1.7 1995-03-08 12:12:30 quinn
+ * Added better error checking.
+ *
+ * Revision 1.6 1995/02/10 15:55:29 quinn
+ * Bug fixes, mostly.
+ *
+ * Revision 1.5 1995/02/09 15:51:49 quinn
* Works better now.
*
* Revision 1.4 1995/02/07 17:53:00 quinn
* Works better now.
*
* Revision 1.4 1995/02/07 17:53:00 quinn
@@
-28,12
+34,13
@@
int odr_sequence_begin(ODR o, void *p, int size)
{
char **pp = (char**) p;
{
char **pp = (char**) p;
+ if (o->error)
+ return 0;
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_SEQUENCE;
}
if (o->t_class < 0)
{
o->t_class = ODR_UNIVERSAL;
o->t_tag = ODR_SEQUENCE;
}
-
if (o->direction == ODR_DECODE)
*pp = 0;
if (odr_constructed_begin(o, p, o->t_class, o->t_tag))
if (o->direction == ODR_DECODE)
*pp = 0;
if (odr_constructed_begin(o, p, o->t_class, o->t_tag))
@@
-64,12
+71,7
@@
int odr_sequence_end(ODR o)
int odr_sequence_more(ODR o)
{
int odr_sequence_more(ODR o)
{
- if (o->stackp < 0)
- return 0;
- if (o->stack[o->stackp].len >= 0)
- return o->bp - o->stack[o->stackp].base < o->stack[o->stackp].len;
- else
- return (!(*o->bp == 0 && *(o->bp + 1) == 0));
+ return odr_constructed_more(o);
}
int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
}
int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
@@
-114,7
+116,9
@@
int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
if (!(*type)(o, *pp + i, 0))
return 0;
break;
if (!(*type)(o, *pp + i, 0))
return 0;
break;
- default: return 0;
+ default:
+ o->error = OOTHER;
+ return 0;
}
return odr_sequence_end(o);
}
}
return odr_sequence_end(o);
}