Smallish.

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

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index f135d85..bb55971 100644 (file)
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -1,10 +1,31 @@
 /*
- * 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_seq.c,v $
- * Revision 1.5  1995-02-09 15:51:49  quinn
+ * Revision 1.12  1995-05-18 13:06:32  quinn
+ * Smallish.
+ *
+ * Revision 1.11  1995/05/17  08:41:54  quinn
+ * Small, hopefully insignificant change.
+ *
+ * Revision 1.10  1995/05/16  08:50:59  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.9  1995/03/17  10:17:57  quinn
+ * Added memory management.
+ *
+ * Revision 1.8  1995/03/15  11:18:05  quinn
+ * Fixed serious bug in odr_cons
+ *
+ * Revision 1.7  1995/03/08  12:12:30  quinn
+ * Added better error checking.
+ *
+ * Revision 1.6  1995/02/10  15:55:29  quinn
+ * Bug fixes, mostly.
+ *
+ * Revision 1.5  1995/02/09  15:51:49  quinn
  * Works better now.
  *
  * Revision 1.4  1995/02/07  17:53:00  quinn
@@ -28,18 +49,19 @@ int odr_sequence_begin(ODR o, void *p, int size)
 {
     char **pp = (char**) p;
 
+    if (o->error)
+       return 0;
     if (o->t_class < 0)
     {
        o->t_class = ODR_UNIVERSAL;
        o->t_tag = ODR_SEQUENCE;
     }
-
     if (o->direction == ODR_DECODE)
        *pp = 0;
     if (odr_constructed_begin(o, p, o->t_class, o->t_tag))
     {
        if (o->direction == ODR_DECODE && size)
-           *pp = nalloc(o, size);
+           *pp = odr_malloc(o, size);
        if (o->direction == ODR_PRINT)
        {
            fprintf(o->print, "%s{\n", odr_indent(o));
@@ -64,22 +86,16 @@ int odr_sequence_end(ODR o)
 
 int odr_sequence_more(ODR o)
 {
-    if (o->stackp < 0)
-       return 0;
-    if (o->stack[o->stackp].len >= 0)
-       return o->bp - o->stack[o->stackp].base < o->stack[o->stackp].len;
-    else
-       return (!(*o->bp == 0 && *(o->bp + 1) == 0));
+    return odr_constructed_more(o);
 }
 
 int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
 {
     char ***pp = (char***) p;  /* for dereferencing */
     char **tmp;
-    char *dummy = "Nothing";
     int size = 0, i;
 
-    if (!odr_sequence_begin(o, &dummy, 0))
+    if (!odr_sequence_begin(o, p, 0))
        return 0;
 
     switch (o->direction)
@@ -92,7 +108,7 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
                if (*num * sizeof(void*) >= size)
                {
                    /* double the buffer size */
-                   tmp = nalloc(o, sizeof(void*) * (size += size ? size :
+                   tmp = odr_malloc(o, sizeof(void*) * (size += size ? size :
                        128));
                    if (*num)
                    {
@@ -110,11 +126,21 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
            }
            break;
        case ODR_ENCODE: case ODR_PRINT:
+#ifdef ODR_DEBUG
+           fprintf(stderr, "[seqof: num=%d]", *num);
+#endif
            for (i = 0; i < *num; i++)
+           {
+#ifdef ODR_DEBUG
+               fprintf(stderr, "[seqof: elem #%d]", i);
+#endif
                if (!(*type)(o, *pp + i, 0))
                    return 0;
+           }
            break;
-       default: return 0;
+       default:
+           o->error = OOTHER;
+           return 0;
     }
     return odr_sequence_end(o);
 }