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

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index 3ea4d2b..4f3fa3b 100644
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -1,10 +1,35 @@
 /*
- * Copyright (c) 1995-1997, 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.20  1997-09-29 07:17:31  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
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.21  1997/11/24 11:33:56  adam
+ * Using function odr_nullval() instead of global ODR_NULLVAL when
+ * appropriate.
+ *
+ * Revision 1.20  1997/09/29 07:17:31  adam
  * Added typecast to avoid warnings on MSVC.
  *
  * Revision 1.19  1997/06/23 10:31:11  adam
@@ -25,8 +50,6 @@
  *
  * 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.
@@ -69,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;
 
@@ -85,10 +111,33 @@ 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);
+    	return 1;
+    }
+    else
+    	return 0;
+}
+
+int odr_set_begin(ODR o, void *p, int size, const char *name)
+{
+    char **pp = (char**) p;
+
+    if (o->error)
+    	return 0;
+    if (o->t_class < 0)
+    {
+    	o->t_class = ODR_UNIVERSAL;
+    	o->t_tag = ODR_SET;
+    }
+    if (o->direction == ODR_DECODE)
+    	*pp = 0;
+    if (odr_constructed_begin(o, p, o->t_class, o->t_tag, name))
     {
     	if (o->direction == ODR_DECODE && size)
-	    *pp = odr_malloc(o, size);
+	    *pp = (char *)odr_malloc(o, size);
     	return 1;
     }
     else
@@ -100,36 +149,35 @@ int odr_sequence_end(ODR o)
     return odr_constructed_end(o);    
 }
 
-int odr_sequence_more(ODR o)
+int odr_set_end(ODR o)
+{
+    return odr_constructed_end(o);    
+}
+
+static int odr_sequence_more(ODR o)
 {
     return odr_constructed_more(o);
 }
 
-int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
+static int odr_sequence_x (ODR o, Odr_fun type, void *p, int *num)
 {
     char ***pp = (char***) p;  /* for dereferencing */
     char **tmp = 0;
     int size = 0, i;
 
-    if (!odr_sequence_begin(o, p, 0)) {
-	if (o->direction == ODR_DECODE)
-	    *num = 0;
-    	return 0;
-    }
-
     switch (o->direction)
     {
     	case ODR_DECODE:
 	    *num = 0;
-	    *pp = ODR_NULLVAL;
+	    *pp = (char **)odr_nullval();
 	    while (odr_sequence_more(o))
 	    {
 		/* outgrown array? */
 		if (*num * (int) sizeof(void*) >= size)
 		{
 		    /* double the buffer size */
-		    tmp = odr_malloc(o, sizeof(void*) * (size += size ? size :
-			128));
+		    tmp = (char **)odr_malloc(o, sizeof(void*) *
+					      (size += size ? size : 128));
 		    if (*num)
 		    {
 			memcpy(tmp, *pp, *num * sizeof(void*));
@@ -140,7 +188,7 @@ int odr_sequence_of(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)++;
 	    }
@@ -154,7 +202,7 @@ int odr_sequence_of(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;
@@ -164,3 +212,25 @@ int odr_sequence_of(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, const char *name)
+{
+    if (!odr_set_begin(o, p, 0, name)) {
+	if (o->direction == ODR_DECODE)
+	    *num = 0;
+    	return 0;
+    }
+    return odr_sequence_x (o, type, p, num);
+}
+
+int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num,
+		    const char *name)
+{
+    if (!odr_sequence_begin(o, p, 0, name)) {
+	if (o->direction == ODR_DECODE)
+	    *num = 0;
+    	return 0;
+    }
+    return odr_sequence_x (o, type, p, num);
+}
+