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
Updated External
[yaz-moved-to-github.git]
/
odr
/
odr_choice.c
diff --git
a/odr/odr_choice.c
b/odr/odr_choice.c
index
9f5ef30
..
0d8fc65
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.7 1995-06-19 13:06:50 quinn
+ * Revision 1.9 1995-08-15 12:00:23 quinn
+ * Updated External
+ *
+ * Revision 1.8 1995/06/19 17:01:51 quinn
+ * This should bring us in sync with the version distributed as 1.0b
+ *
+ * Revision 1.7 1995/06/19 13:06:50 quinn
* Fixed simple bug in the code to handle untagged choice elements.
*
* Revision 1.6 1995/05/16 08:50:53 quinn
* Fixed simple bug in the code to handle untagged choice elements.
*
* Revision 1.6 1995/05/16 08:50:53 quinn
@@
-31,16
+37,21
@@
int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
{
int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
{
- int i, cl = -1, tg, cn, *which = whichp;
+ int i, cl = -1, tg, cn, *which = whichp, bias = o->choice_bias;
if (o->error)
return 0;
if (o->direction != ODR_DECODE && !*(char**)p)
return 0;
if (o->error)
return 0;
if (o->direction != ODR_DECODE && !*(char**)p)
return 0;
+ o->choice_bias = -1;
for (i = 0; arm[i].fun; i++)
{
if (o->direction == ODR_DECODE)
for (i = 0; arm[i].fun; i++)
{
if (o->direction == ODR_DECODE)
+ {
+ if (bias >= 0 && bias != arm[i].which)
+ continue;
*which = arm[i].which;
*which = arm[i].which;
+ }
else if (*which != arm[i].which)
continue;
else if (*which != arm[i].which)
continue;
@@
-74,7
+85,7
@@
int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
}
else /* no tagging. Have to poll type */
{
}
else /* no tagging. Have to poll type */
{
- if ((*arm[i].fun)(o, p, 1) && *(char*)p)
+ if ((*arm[i].fun)(o, p, 1) && *(char**)p)
return 1;
}
}
return 1;
}
}
@@
-82,3
+93,8
@@
int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
*(char*)p = 0;
return 0;
}
*(char*)p = 0;
return 0;
}
+
+void odr_choice_bias(ODR o, int what)
+{
+ o->choice_bias = what;
+}