Minor fix.

[yaz-moved-to-github.git] / odr / odr_choice.c

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 9f5ef30..f0a8f9a 100644 (file)
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -4,7 +4,32 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_choice.c,v $
- * Revision 1.7  1995-06-19 13:06:50  quinn
+ * Revision 1.15  1998-02-11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.14  1997/05/14 06:53:57  adam
+ * C++ support.
+ *
+ * Revision 1.13  1997/04/30 08:52:10  quinn
+ * Null
+ *
+ * Revision 1.12  1996/10/08  12:58:17  adam
+ * New ODR function, odr_choice_enable_bias, to control behaviour of
+ * odr_choice_bias.
+ *
+ * Revision 1.11  1995/09/29  17:12:23  quinn
+ * Smallish
+ *
+ * Revision 1.10  1995/09/27  15:02:58  quinn
+ * Modified function heads & prototypes.
+ *
+ * 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
@@ -31,16 +56,21 @@
 
 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 = (int *)whichp, bias = o->choice_bias;
 
     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)
+       {
+           if (bias >= 0 && bias != arm[i].which)
+               continue;
            *which = arm[i].which;
+       }
        else if (*which != arm[i].which)
            continue;
 
@@ -55,26 +85,26 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
            }
            else if (o->direction != ODR_DECODE)
            {
-               cl = arm[i].class;
+               cl = arm[i].zclass;
                tg = arm[i].tag;
            }
-           if (tg == arm[i].tag && cl == arm[i].class)
+           if (tg == arm[i].tag && cl == arm[i].zclass)
            {
                if (arm[i].tagmode == ODR_IMPLICIT)
                {
                    odr_implicit_settag(o, cl, tg);
-                   return (*arm[i].fun)(o, p, 0);
+                   return (*arm[i].fun)(o, (char **)p, 0);
                }
                /* explicit */
                if (!odr_constructed_begin(o, p, cl, tg))
                    return 0;
-               return (*arm[i].fun)(o, p, 0) &&
+               return (*arm[i].fun)(o, (char **)p, 0) &&
                    odr_constructed_end(o);
            }
        }
        else  /* no tagging. Have to poll type */
        {
-           if ((*arm[i].fun)(o, p, 1) && *(char*)p)
+           if ((*arm[i].fun)(o, (char **)p, 1) && *(char**)p)
                return 1;
        }
     }
@@ -82,3 +112,14 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
     *(char*)p = 0;
     return 0;
 }
+
+void odr_choice_bias(ODR o, int what)
+{
+    if (o->enable_bias)
+        o->choice_bias = what;
+}
+
+void odr_choice_enable_bias (ODR o, int mode)
+{
+    o->enable_bias = mode;
+}