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
*** empty log message ***
[yaz-moved-to-github.git]
/
odr
/
odr_choice.c
diff --git
a/odr/odr_choice.c
b/odr/odr_choice.c
index
8faf925
..
1c5d1af
100644
(file)
--- a/
odr/odr_choice.c
+++ b/
odr/odr_choice.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_choice.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: odr_choice.c,v $
- * Revision 1.3 1995-03-08 12:12:22 quinn
+ * Revision 1.5 1995-03-18 12:16:31 quinn
+ * Minor changes.
+ *
+ * Revision 1.4 1995/03/14 16:59:38 quinn
+ * Added odr_constructed_more check
+ *
+ * Revision 1.3 1995/03/08 12:12:22 quinn
* Added better error checking.
*
* Revision 1.2 1995/02/09 15:51:48 quinn
* Added better error checking.
*
* Revision 1.2 1995/02/09 15:51:48 quinn
@@
-17,9
+23,9
@@
#include <odr.h>
#include <odr.h>
-int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
+int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
{
{
- int i, cl = -1, tg, cn;
+ int i, cl = -1, tg, cn, *which = whichp;
if (o->error)
return 0;
if (o->error)
return 0;
@@
-36,6
+42,8
@@
int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
{
if (o->direction == ODR_DECODE && cl < 0)
{
{
if (o->direction == ODR_DECODE && cl < 0)
{
+ if (o->stackp > -1 && !odr_constructed_more(o))
+ return 0;
if (ber_dectag(o->bp, &cl, &tg, &cn) <= 0)
return 0;
}
if (ber_dectag(o->bp, &cl, &tg, &cn) <= 0)
return 0;
}