X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_seq.c;h=e1ec9f11d8f6ccdbd0fb56e4f26d47593ff3bceb;hb=3050c29a2d88f6af325f1fb9ae6d0927babf9193;hp=df8e12486946e8da73d34208bad7d26900e050e7;hpb=41f4b2c49b60cf5f9ae896b537211ae830c39a55;p=yaz-moved-to-github.git

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index df8e124..e1ec9f1 100644
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -1,10 +1,28 @@
 /*
- * 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.7  1995-03-08 12:12:30  quinn
+ * 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
@@ -46,7 +64,7 @@ int odr_sequence_begin(ODR o, void *p, int size)
     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));
@@ -77,24 +95,24 @@ int odr_sequence_more(ODR 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";
+    char **tmp = 0;
     int size = 0, i;
 
-    if (!odr_sequence_begin(o, &dummy, 0))
+    if (!odr_sequence_begin(o, p, 0))
     	return 0;
 
     switch (o->direction)
     {
     	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)
 		    {
@@ -112,9 +130,17 @@ 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:
 	    o->error = OOTHER;