Small mods.

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

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index 97ddc47..68c0c55 100644 (file)
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_seq.c,v $
- * Revision 1.1  1995-02-02 16:21:54  quinn
+ * Revision 1.2  1995-02-06 16:45:03  quinn
+ * Small mods.
+ *
+ * Revision 1.1  1995/02/02  16:21:54  quinn
  * First kick.
  *
  */
@@ -23,7 +26,7 @@ int odr_sequence_begin(ODR o, void *p, int size)
 
     if (odr_constructed_begin(o, p, o->t_class, o->t_tag, 0))
     {
-       if (o->direction == ODR_DECODE)
+       if (o->direction == ODR_DECODE && size)
            *pp = nalloc(o, size);
        return 1;
     }
@@ -35,3 +38,49 @@ int odr_sequence_end(ODR o)
 {
     return odr_constructed_end(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));
+}
+
+int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
+{
+    char **pp = (char**) p;  /* for dereferencing */
+    char *tmp;
+    int size = 0;
+
+    if (!odr_sequence_begin(o, p, 0))
+       return 0;
+
+    if (o->direction = ODR_DECODE)
+       *num = 0;
+    while (odr_sequence_more(o))
+    {
+       /* outgrown array? */
+       if (*num * sizeof(void*) >= size)
+       {
+           /* double the buffer size */
+           tmp = nalloc(o, sizeof(void*) * (size += size ? size :
+               128));
+           if (*num)
+           {
+               memcpy(tmp, *pp, *num * sizeof(void*));
+               /*
+                * For now, we just throw the old *p away, since we use
+                * nibble memory anyway (disgusting, isn't it?).
+                */
+               *pp = tmp;
+           }
+       }
+       if (!(*type)(o, (*pp)[*num++], 0))
+           return 0;
+       *num++;
+    }
+    return odr_sequence_end(o);
+}