X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_cons.c;h=1664320f79f79b851b3ba154f4f77c0412272f50;hb=a19243ec18959150a30c63c521fc5b0af860ce18;hp=4e54334c64ccaa7f292adceb131983b6469de266;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;p=yaz-moved-to-github.git

diff --git a/odr/odr_cons.c b/odr/odr_cons.c
index 4e54334..1664320 100644
--- a/odr/odr_cons.c
+++ b/odr/odr_cons.c
@@ -1,16 +1,30 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_cons.c,v $
- * Revision 1.14  1995-09-27 15:02:58  quinn
+ * Revision 1.19  1999-04-20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.18  1997/05/14 06:53:58  adam
+ * C++ support.
+ *
+ * Revision 1.17  1996/10/23 12:31:24  adam
+ * Added 'static' modifier to dummy variable in odr_constructed_begin.
+ *
+ * Revision 1.16  1996/07/26  13:38:20  quinn
+ * Various smaller things. Gathered header-files.
+ *
+ * Revision 1.15  1995/09/29  17:12:23  quinn
+ * Smallish
+ *
+ * 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.
@@ -54,16 +68,24 @@
 #include <odr.h>
 #include <assert.h>
 
-int MDF odr_constructed_begin(ODR o, void *p, int class, int tag)
+void odr_setlenlen(ODR o, int len)
+{
+    o->lenlen = len;
+}
+
+int odr_constructed_begin(ODR o, void *p, int zclass, int tag,
+			  const char *name)
 {
     int res;
     int cons = 1;
+    int lenlen = o->lenlen;
 
     if (o->error)
     	return 0;
+    o->lenlen = 1; /* reset lenlen */
     if (o->t_class < 0)
     {
-	o->t_class = class;
+	o->t_class = zclass;
 	o->t_tag = tag;
     }
     if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, 1)) < 0)
@@ -83,8 +105,11 @@ int MDF odr_constructed_begin(ODR o, void *p, int class, int tag)
 #endif
     if (o->direction == ODR_ENCODE)
     {
-	o->stack[o->stackp].lenlen = 1;
-	if (odr_putc(o, 0) < 0)     /* dummy */
+	static unsigned char dummy[sizeof(int)+1];
+
+	o->stack[o->stackp].lenlen = lenlen;
+
+	if (odr_write(o, dummy, lenlen) < 0) /* dummy */
 	    return 0;
     }
     else if (o->direction == ODR_DECODE)
@@ -97,7 +122,8 @@ int MDF odr_constructed_begin(ODR o, void *p, int class, int tag)
     }
     else if (o->direction == ODR_PRINT)
     {
-    	fprintf(o->print, "%s{\n", odr_indent(o));
+	odr_prname(o, name);
+    	fprintf(o->print, "{\n");
 	o->indent++;
     }
     else
@@ -110,7 +136,7 @@ int MDF odr_constructed_begin(ODR o, void *p, int class, int tag)
     return 1;
 }
 
-int MDF odr_constructed_more(ODR o)
+int odr_constructed_more(ODR o)
 {
     if (o->error)
     	return 0;
@@ -122,7 +148,7 @@ int MDF odr_constructed_more(ODR o)
     	return (!(*o->bp == 0 && *(o->bp + 1) == 0));
 }
 
-int MDF odr_constructed_end(ODR o)
+int odr_constructed_end(ODR o)
 {
     int res;
     int pos;
@@ -164,7 +190,10 @@ int MDF odr_constructed_end(ODR o)
 	    odr_seek(o, ODR_S_SET, o->stack[o->stackp].len_offset);
 	    if ((res = ber_enclen(o, pos - o->stack[o->stackp].base_offset,
 		o->stack[o->stackp].lenlen, 1)) < 0)
+	    {
+		o->error = OLENOV;
 		return 0;
+	    }
 	    odr_seek(o, ODR_S_END, 0);
 	    if (res == 0)   /* indefinite encoding */
 	    {
@@ -186,7 +215,8 @@ int MDF odr_constructed_end(ODR o)
 	    assert(o->indent > 0);
 	    o->stackp--;
 	    o->indent--;
-	    fprintf(o->print, "%s}\n", odr_indent(o));
+	    odr_prname(o, 0);
+	    fprintf(o->print, "}\n");
 	    return 1;
     	default:
 	    o->error = OOTHER;