In handling of SEQUENCE OF: Counter set to zero when SEQUENCE

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

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index 8ab4e03..d682c3f 100644 (file)
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_seq.c,v $
- * Revision 1.15  1995-09-27 15:03:00  quinn
+ * Revision 1.17  1997-05-05 11:21:09  adam
+ * In handling of SEQUENCE OF: Counter set to zero when SEQUENCE
+ * OF isn't there at all.
+ *
+ * Revision 1.16  1995/09/29 17:12:26  quinn
+ * Smallish
+ *
+ * Revision 1.15  1995/09/27  15:03:00  quinn
  * Modified function heads & prototypes.
  *
  * Revision 1.14  1995/08/15  11:16:39  quinn
@@ -56,7 +63,7 @@
 #include <odr.h>
 #include <assert.h>
 
-int MDF odr_sequence_begin(ODR o, void *p, int size)
+int odr_sequence_begin(ODR o, void *p, int size)
 {
     char **pp = (char**) p;
 
@@ -79,7 +86,7 @@ int MDF odr_sequence_begin(ODR o, void *p, int size)
        return 0;
 }
 
-int MDF odr_sequence_end(ODR o)
+int odr_sequence_end(ODR o)
 {
     return odr_constructed_end(o);    
 }
@@ -89,14 +96,18 @@ int odr_sequence_more(ODR o)
     return odr_constructed_more(o);
 }
 
-int MDF odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
+int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
 {
     char ***pp = (char***) p;  /* for dereferencing */
     char **tmp = 0;
     int size = 0, i;
 
-    if (!odr_sequence_begin(o, p, 0))
+    if (!odr_sequence_begin(o, p, 0)) {
+       if (o->direction == ODR_DECODE) {
+            *num = 0;
+       }
        return 0;
+    }
 
     switch (o->direction)
     {