X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_choice.c;h=7bc6b283081c9a04538279c5622be6e448540f3b;hb=9edede4a23ba78a2c4a463eabbe7623e7f8d8fbd;hp=f54711a2cc84acc86af8cd77fc9e1f4e46e223af;hpb=10981b2f116449523a9f628c20a78212ce91553e;p=yaz-moved-to-github.git

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index f54711a..7bc6b28 100644
--- a/odr/odr_choice.c
+++ b/odr/odr_choice.c
@@ -1,10 +1,22 @@
 /*
- * 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.2  1995-02-09 15:51:48  quinn
+ * 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
@@ -14,10 +26,12 @@
 
 #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->direction != ODR_DECODE && !*(char**)p)
     	return 0;
     for (i = 0; arm[i].fun; i++)
@@ -31,6 +45,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;
 	    }