This should bring us in sync with the version distributed as 1.0b

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

diff --git a/odr/odr_choice.c b/odr/odr_choice.c
index 8883b04..8727aac 100644 (file)
--- 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.4  1995-03-14 16:59:38  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
@@ -20,9 +32,9 @@
 
 #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;
@@ -64,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;