X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_seq.c;h=4f3fa3b50d34c1aee46328331393a7eb31097f80;hb=045c1b65972cd05508ff188e201c17e5da571b43;hp=d0f198e2d130f881b20054519448f85c7e569730;hpb=74582047b4f19d220c6722a85f4651dc742f083f;p=yaz-moved-to-github.git

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index d0f198e..4f3fa3b 100644
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (c) 1995-1998, Index Data
+ * Copyright (c) 1995-2000, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_seq.c,v $
- * Revision 1.23  1998-03-20 14:45:01  adam
+ * Revision 1.27  2000-02-29 13:44:55  adam
+ * Check for config.h (currently not generated).
+ *
+ * Revision 1.26  2000/01/31 13:15:21  adam
+ * Removed uses of assert(3). Cleanup of ODR. CCL parser update so
+ * that some characters are not surrounded by spaces in resulting term.
+ * ILL-code updates.
+ *
+ * Revision 1.25  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.24  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.23  1998/03/20 14:45:01  adam
  * Implemented odr_enum and odr_set_of.
  *
  * Revision 1.22  1998/02/11 11:53:34  adam
@@ -77,10 +92,13 @@
  *
  */
 
-#include <odr.h>
-#include <assert.h>
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <yaz/odr.h>
 
-int odr_sequence_begin(ODR o, void *p, int size)
+int odr_sequence_begin(ODR o, void *p, int size, const char *name)
 {
     char **pp = (char**) p;
 
@@ -93,7 +111,7 @@ int odr_sequence_begin(ODR o, void *p, int size)
     }
     if (o->direction == ODR_DECODE)
     	*pp = 0;
-    if (odr_constructed_begin(o, p, o->t_class, o->t_tag))
+    if (odr_constructed_begin(o, p, o->t_class, o->t_tag, name))
     {
     	if (o->direction == ODR_DECODE && size)
 	    *pp = (char *)odr_malloc(o, size);
@@ -103,7 +121,7 @@ int odr_sequence_begin(ODR o, void *p, int size)
     	return 0;
 }
 
-int odr_set_begin(ODR o, void *p, int size)
+int odr_set_begin(ODR o, void *p, int size, const char *name)
 {
     char **pp = (char**) p;
 
@@ -116,7 +134,7 @@ int odr_set_begin(ODR o, void *p, int size)
     }
     if (o->direction == ODR_DECODE)
     	*pp = 0;
-    if (odr_constructed_begin(o, p, o->t_class, o->t_tag))
+    if (odr_constructed_begin(o, p, o->t_class, o->t_tag, name))
     {
     	if (o->direction == ODR_DECODE && size)
 	    *pp = (char *)odr_malloc(o, size);
@@ -170,7 +188,7 @@ static int odr_sequence_x (ODR o, Odr_fun type, void *p, int *num)
 		    }
 		    *pp = tmp;
 		}
-		if (!(*type)(o, (*pp) + *num, 0))
+		if (!(*type)(o, (*pp) + *num, 0, 0))
 		    return 0;
 		(*num)++;
 	    }
@@ -184,7 +202,7 @@ static int odr_sequence_x (ODR o, Odr_fun type, void *p, int *num)
 #ifdef ODR_DEBUG
 		fprintf(stderr, "[seqof: elem #%d]", i);
 #endif
-	    	if (!(*type)(o, *pp + i, 0))
+	    	if (!(*type)(o, *pp + i, 0, 0))
 		    return 0;
 	    }
 	    break;
@@ -195,9 +213,9 @@ static int odr_sequence_x (ODR o, Odr_fun type, void *p, int *num)
     return odr_sequence_end(o);
 }
 
-int odr_set_of(ODR o, Odr_fun type, void *p, int *num)
+int odr_set_of(ODR o, Odr_fun type, void *p, int *num, const char *name)
 {
-    if (!odr_set_begin(o, p, 0)) {
+    if (!odr_set_begin(o, p, 0, name)) {
 	if (o->direction == ODR_DECODE)
 	    *num = 0;
     	return 0;
@@ -205,9 +223,10 @@ int odr_set_of(ODR o, Odr_fun type, void *p, int *num)
     return odr_sequence_x (o, type, p, num);
 }
 
-int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
+int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num,
+		    const char *name)
 {
-    if (!odr_sequence_begin(o, p, 0)) {
+    if (!odr_sequence_begin(o, p, 0, name)) {
 	if (o->direction == ODR_DECODE)
 	    *num = 0;
     	return 0;