X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_cons.c;h=92ebf6a2f3beba620063194c917706bdae622f81;hb=1b06a5c10770ef964044f824a33d4cc8652d8e7a;hp=043bb76b684a13fb870c027b18071d535aad731b;hpb=a7d28a25277a208edb9c44d124f179cc2be6db70;p=yaz-moved-to-github.git

diff --git a/odr/odr_cons.c b/odr/odr_cons.c
index 043bb76..92ebf6a 100644
--- a/odr/odr_cons.c
+++ b/odr/odr_cons.c
@@ -4,29 +4,38 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_cons.c,v $
- * Revision 1.1  1995-02-02 16:21:53  quinn
+ * Revision 1.4  1995-02-10 15:55:29  quinn
+ * Bug fixes, mostly.
+ *
+ * Revision 1.3  1995/02/09  15:51:48  quinn
+ * Works better now.
+ *
+ * Revision 1.2  1995/02/07  17:52:59  quinn
+ * A damn mess, but now things work, I think.
+ *
+ * Revision 1.1  1995/02/02  16:21:53  quinn
  * First kick.
  *
  */
 
 #include <odr.h>
 
-int odr_constructed_begin(ODR o, void *p, int class, int tag, int opt)
+int odr_constructed_begin(ODR o, void *p, int class, int tag)
 {
     int res;
     int cons = 1;
 
-    if (o->direction == ODR_ENCODE && !*(char*)p)
-    	return opt;
     if (o->t_class < 0)
     {
 	o->t_class = class;
 	o->t_tag = tag;
     }
-    if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons)) < 0)
+    if (o->direction == ODR_DECODE)
+    	*(char**)p = 0;
+    if ((res = ber_tag(o, *(char**)p, o->t_class, o->t_tag, &cons)) < 0)
     	return 0;
     if (!res || !cons)
-    	return opt;
+    	return 0;
 
     o->stack[++(o->stackp)].lenb = o->bp;
     if (o->direction == ODR_ENCODE || o->direction == ODR_PRINT)
@@ -49,6 +58,16 @@ int odr_constructed_begin(ODR o, void *p, int class, int tag, int opt)
     return 1;
 }
 
+int odr_constructed_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));
+}
+
 int odr_constructed_end(ODR o)
 {
     int res;