X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_cons.c;h=4e54334c64ccaa7f292adceb131983b6469de266;hb=aa45b978839c268db6eccafc6a13452d99a7929c;hp=83231a3baddf4293fd4f73dd0d2263e24a9ce908;hpb=42d3d8a6486c495357574e5db0fc736834d8ba40;p=yaz-moved-to-github.git

diff --git a/odr/odr_cons.c b/odr/odr_cons.c
index 83231a3..4e54334 100644
--- a/odr/odr_cons.c
+++ b/odr/odr_cons.c
@@ -4,7 +4,15 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_cons.c,v $
- * Revision 1.12  1995-06-19 12:38:47  quinn
+ * Revision 1.14  1995-09-27 15:02:58  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.13  1995/08/15  11:16:39  quinn
+ * Fixed pretty-printers.
+ * CV:e ----------------------------------------------------------------------
+ * CV:e ----------------------------------------------------------------------
+ *
+ * Revision 1.12  1995/06/19  12:38:47  quinn
  * Added BER dumper.
  *
  * Revision 1.11  1995/05/16  08:50:53  quinn
@@ -44,8 +52,9 @@
  */
 
 #include <odr.h>
+#include <assert.h>
 
-int odr_constructed_begin(ODR o, void *p, int class, int tag)
+int MDF odr_constructed_begin(ODR o, void *p, int class, int tag)
 {
     int res;
     int cons = 1;
@@ -72,7 +81,7 @@ int odr_constructed_begin(ODR o, void *p, int class, int tag)
 #ifdef ODR_DEBUG
     fprintf(stderr, "[cons_begin(%d)]", o->stackp);
 #endif
-    if (o->direction == ODR_ENCODE || o->direction == ODR_PRINT)
+    if (o->direction == ODR_ENCODE)
     {
 	o->stack[o->stackp].lenlen = 1;
 	if (odr_putc(o, 0) < 0)     /* dummy */
@@ -86,14 +95,22 @@ int odr_constructed_begin(ODR o, void *p, int class, int tag)
 	o->bp += res;
 	o->left -= res;
     }
-    else return 0;
-
+    else if (o->direction == ODR_PRINT)
+    {
+    	fprintf(o->print, "%s{\n", odr_indent(o));
+	o->indent++;
+    }
+    else
+    {
+    	o->error = OOTHER;
+	return 0;
+    }
     o->stack[o->stackp].base = o->bp;
     o->stack[o->stackp].base_offset = odr_tell(o);
     return 1;
 }
 
-int odr_constructed_more(ODR o)
+int MDF odr_constructed_more(ODR o)
 {
     if (o->error)
     	return 0;
@@ -105,7 +122,7 @@ int odr_constructed_more(ODR o)
     	return (!(*o->bp == 0 && *(o->bp + 1) == 0));
 }
 
-int odr_constructed_end(ODR o)
+int MDF odr_constructed_end(ODR o)
 {
     int res;
     int pos;
@@ -165,7 +182,12 @@ int odr_constructed_end(ODR o)
 #endif
 	    o->stackp--;
 	    return 1;
-    	case ODR_PRINT: o->stackp--;  return 1;
+    	case ODR_PRINT:
+	    assert(o->indent > 0);
+	    o->stackp--;
+	    o->indent--;
+	    fprintf(o->print, "%s}\n", odr_indent(o));
+	    return 1;
     	default:
 	    o->error = OOTHER;
 	    return 0;