X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_choice.c;h=1ad923a7dc3e09fb128f3af3f033029bf349bc47;hb=a19243ec18959150a30c63c521fc5b0af860ce18;hp=46be20703df3d4e5d58e14af9026681f5e02b828;hpb=85a2e7affad79fd8bd59b403ba7b5f7867d60523;p=yaz-moved-to-github.git

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 46be207..1ad923a 100644
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -1,10 +1,20 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_choice.c,v $
- * Revision 1.13  1997-04-30 08:52:10  quinn
+ * Revision 1.16  1999-04-20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * 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
@@ -48,15 +58,25 @@
 
 #include <odr.h>
 
-int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp)
+int odr_choice(ODR o, Odr_arm arm[], void *p, void *whichp,
+	       const char *name)
 {
-    int i, cl = -1, tg, cn, *which = whichp, bias = o->choice_bias;
+    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;
+
+    if (o->direction == ODR_PRINT)
+    {
+	if (name)
+	{
+	    odr_prname(o, name);
+	    fprintf (o->print, "choice\n");
+	}
+    }
     for (i = 0; arm[i].fun; i++)
     {
     	if (o->direction == ODR_DECODE)
@@ -79,26 +99,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, arm[i].name);
 		}
 		/* explicit */
-		if (!odr_constructed_begin(o, p, cl, tg))
+		if (!odr_constructed_begin(o, p, cl, tg, 0))
 		    return 0;
-		return (*arm[i].fun)(o, p, 0) &&
+		return (*arm[i].fun)(o, (char **)p, 0, arm[i].name) &&
 		    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, arm[i].name) && *(char**)p)
 	    	return 1;
 	}
     }