X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_seq.c;h=8ab4e03e639a55eca3c5fd644adf3aad8bc58b04;hb=aa45b978839c268db6eccafc6a13452d99a7929c;hp=bb55971238a94417e549f3d56e4f68b2dcd44c79;hpb=86927dcf1fb5dbd4d30f2d906ff5ceba7319f142;p=yaz-moved-to-github.git

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index bb55971..8ab4e03 100644
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -4,7 +4,18 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_seq.c,v $
- * Revision 1.12  1995-05-18 13:06:32  quinn
+ * 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
@@ -45,7 +56,7 @@
 #include <odr.h>
 #include <assert.h>
 
-int odr_sequence_begin(ODR o, void *p, int size)
+int MDF odr_sequence_begin(ODR o, void *p, int size)
 {
     char **pp = (char**) p;
 
@@ -62,25 +73,14 @@ int odr_sequence_begin(ODR o, void *p, int size)
     {
     	if (o->direction == ODR_DECODE && size)
 	    *pp = odr_malloc(o, size);
-	if (o->direction == ODR_PRINT)
-	{
-	    fprintf(o->print, "%s{\n", odr_indent(o));
-	    o->indent++;
-	}
     	return 1;
     }
     else
     	return 0;
 }
 
-int odr_sequence_end(ODR o)
+int MDF odr_sequence_end(ODR o)
 {
-    if (o->direction == ODR_PRINT)
-    {
-    	assert(o->indent > 0);
-    	o->indent--;
-    	fprintf(o->print, "%s}\n", odr_indent(o));
-    }
     return odr_constructed_end(o);    
 }
 
@@ -89,10 +89,10 @@ int odr_sequence_more(ODR o)
     return odr_constructed_more(o);
 }
 
-int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
+int MDF 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))
@@ -102,6 +102,7 @@ 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? */