SRW, CQL, 2003

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

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index f135d85..c23614b 100644 (file)
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -1,99 +1,97 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-2003, 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
- * Works better now.
- *
- * Revision 1.4  1995/02/07  17:53:00  quinn
- * A damn mess, but now things work, I think.
- *
- * Revision 1.3  1995/02/07  14:13:46  quinn
- * Bug fixes.
- *
- * Revision 1.2  1995/02/06  16:45:03  quinn
- * Small mods.
- *
- * Revision 1.1  1995/02/02  16:21:54  quinn
- * First kick.
- *
+ * $Id: odr_seq.c,v 1.29 2003-01-06 08:20:28 adam Exp $
  */
 
-#include <odr.h>
-#include <assert.h>
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "odr-priv.h"
 
-int odr_sequence_begin(ODR o, void *p, int size)
+int odr_sequence_begin(ODR o, void *p, int size, const char *name)
 {
     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 (odr_constructed_begin(o, p, o->t_class, o->t_tag, name))
     {
        if (o->direction == ODR_DECODE && size)
-           *pp = nalloc(o, size);
-       if (o->direction == ODR_PRINT)
-       {
-           fprintf(o->print, "%s{\n", odr_indent(o));
-           o->indent++;
-       }
+           *pp = (char *)odr_malloc(o, size);
        return 1;
     }
     else
        return 0;
 }
 
-int odr_sequence_end(ODR o)
+int odr_set_begin(ODR o, void *p, int size, const char *name)
 {
-    if (o->direction == ODR_PRINT)
+    char **pp = (char**) p;
+
+    if (o->error)
+       return 0;
+    if (o->t_class < 0)
     {
-       assert(o->indent > 0);
-       o->indent--;
-       fprintf(o->print, "%s}\n", odr_indent(o));
+       o->t_class = ODR_UNIVERSAL;
+       o->t_tag = ODR_SET;
+    }
+    if (o->direction == ODR_DECODE)
+       *pp = 0;
+    if (odr_constructed_begin(o, p, o->t_class, o->t_tag, name))
+    {
+       if (o->direction == ODR_DECODE && size)
+           *pp = (char *)odr_malloc(o, size);
+       return 1;
     }
+    else
+       return 0;
+}
+
+int odr_sequence_end(ODR o)
+{
     return odr_constructed_end(o);    
 }
 
-int odr_sequence_more(ODR o)
+int odr_set_end(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_end(o);    
+}
+
+static int odr_sequence_more(ODR o)
+{
+    return odr_constructed_more(o);
 }
 
-int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
+static int odr_sequence_x (ODR o, Odr_fun type, void *p, int *num)
 {
     char ***pp = (char***) p;  /* for dereferencing */
-    char **tmp;
-    char *dummy = "Nothing";
+    char **tmp = 0;
     int size = 0, i;
 
-    if (!odr_sequence_begin(o, &dummy, 0))
-       return 0;
-
     switch (o->direction)
     {
        case ODR_DECODE:
            *num = 0;
+           *pp = (char **)odr_nullval();
            while (odr_sequence_more(o))
            {
                /* outgrown array? */
-               if (*num * sizeof(void*) >= size)
+               if (*num * (int) sizeof(void*) >= size)
                {
                    /* double the buffer size */
-                   tmp = nalloc(o, sizeof(void*) * (size += size ? size :
-                       128));
+                   tmp = (char **)odr_malloc(o, sizeof(void*) *
+                                             (size += size ? size : 128));
                    if (*num)
                    {
                        memcpy(tmp, *pp, *num * sizeof(void*));
@@ -104,17 +102,49 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
                    }
                    *pp = tmp;
                }
-               if (!(*type)(o, (*pp) + *num, 0))
+               if (!(*type)(o, (*pp) + *num, 0, 0))
                    return 0;
                (*num)++;
            }
            break;
        case ODR_ENCODE: case ODR_PRINT:
+#ifdef ODR_DEBUG
+           fprintf(stderr, "[seqof: num=%d]", *num);
+#endif
            for (i = 0; i < *num; i++)
-               if (!(*type)(o, *pp + i, 0))
+           {
+#ifdef ODR_DEBUG
+               fprintf(stderr, "[seqof: elem #%d]", i);
+#endif
+               if (!(*type)(o, *pp + i, 0, 0))
                    return 0;
+           }
            break;
-       default: return 0;
+       default:
+           o->error = OOTHER;
+           return 0;
     }
     return odr_sequence_end(o);
 }
+
+int odr_set_of(ODR o, Odr_fun type, void *p, int *num, const char *name)
+{
+    if (!odr_set_begin(o, p, 0, name)) {
+       if (o->direction == ODR_DECODE)
+           *num = 0;
+       return 0;
+    }
+    return odr_sequence_x (o, type, p, num);
+}
+
+int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num,
+                   const char *name)
+{
+    if (!odr_sequence_begin(o, p, 0, name)) {
+       if (o->direction == ODR_DECODE)
+           *num = 0;
+       return 0;
+    }
+    return odr_sequence_x (o, type, p, num);
+}
+