X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_seq.c;h=66377f83bf7af1691997b110da1b6433ca280e6f;hb=13710cb8cd0a6b8d6a1f88ff69f3a2ec2ec9769c;hp=e2d0cbf943758cf8b06321f60d4b972eaaa592c9;hpb=b40d7c8dfa49bf5e6800688e1dfb1373856796a8;p=yaz-moved-to-github.git

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index e2d0cbf..66377f8 100644
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -1,10 +1,51 @@
 /*
- * 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.3  1995-02-07 14:13:46  quinn
+ * 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
+ * Fixed pretty-printers.
+ * CV:e ----------------------------------------------------------------------
+ * CV:e ----------------------------------------------------------------------
+ *
+ * Revision 1.13  1995/05/22  14:56:57  quinn
+ * Fixed problem in decoding empty sequence.
+ *
+ * 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
+ * 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
@@ -16,21 +57,25 @@
  */
 
 #include <odr.h>
+#include <assert.h>
 
 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 (odr_constructed_begin(o, p, o->t_class, o->t_tag, 0))
+    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);
     	return 1;
     }
     else
@@ -44,18 +89,13 @@ 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 **tmp = 0;
     int size = 0, i;
 
     if (!odr_sequence_begin(o, p, 0))
@@ -65,13 +105,14 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
     {
     	case ODR_DECODE:
 	    *num = 0;
+	    *pp = ODR_NULLVAL;
 	    while (odr_sequence_more(o))
 	    {
 		/* outgrown array? */
 		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)
 		    {
@@ -88,13 +129,22 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
 		(*num)++;
 	    }
 	    break;
-    	case ODR_ENCODE:
+    	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;
-    	case ODR_PRINT: return 1;
-    	default: return 0;
+    	default:
+	    o->error = OOTHER;
+	    return 0;
     }
     return odr_sequence_end(o);
 }