X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_choice.c;h=8727aac2592b9b53e68c3714c5c5c6862f88b2cd;hb=d1c4d0f9dc12fadca9004dba185f78deeed46415;hp=086631142331c09236c3fe257bdfcebf3c92b43f;hpb=0dcf720d5b83783f6dba31f44b12513cefdd2f75;p=yaz-moved-to-github.git

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 0866311..8727aac 100644
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -1,21 +1,44 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_choice.c,v $
- * Revision 1.1  1995-02-07 17:52:59  quinn
+ * 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
+ * License, documentation, and memory fixes
+ *
+ * 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
+ * Works better now.
+ *
+ * Revision 1.1  1995/02/07  17:52:59  quinn
  * A damn mess, but now things work, I think.
  *
  */
 
 #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->direction != ODR_DECODE && !*(char*)p)
+    if (o->error)
+    	return 0;
+    if (o->direction != ODR_DECODE && !*(char**)p)
     	return 0;
     for (i = 0; arm[i].fun; i++)
     {
@@ -28,6 +51,8 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
     	{
 	    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;
 	    }
@@ -51,8 +76,10 @@ int odr_choice(ODR o, Odr_arm arm[], void *p, int *which)
 	    }
 	}
 	else  /* no tagging. Have to poll type */
-	    if ((*arm[i].fun)(o, p, 0))
+	{
+	    if ((*arm[i].fun)(o, p, 1) && *(char**)p)
 	    	return 1;
+	}
     }
     *which = -1;
     *(char*)p = 0;