X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=odr%2Fodr_seq.c;h=b5edb90f14b76ab6f00e2ea7726f3db09b9f3d23;hb=a807bde38544a7aa45dd2988e504a1acb3fd30c0;hp=76079208507d905fe7ba508619ee25d1d3f12fdf;hpb=76231afd95f258db5024620636824dc905cf1de4;p=yaz-moved-to-github.git

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index 7607920..b5edb90 100644
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -1,10 +1,33 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1997, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_seq.c,v $
- * Revision 1.14  1995-08-15 11:16:39  quinn
+ * 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
+ * Added RVDM's SEQUENCE OF patch again!
+ *
+ * Revision 1.18  1997/05/14 06:53:58  adam
+ * C++ support.
+ *
+ * Revision 1.17  1997/05/05 11:21:09  adam
+ * In handling of SEQUENCE OF: Counter set to zero when SEQUENCE
+ * OF isn't there at all.
+ *
+ * Revision 1.16  1995/09/29 17:12:26  quinn
+ * Smallish
+ *
+ * Revision 1.15  1995/09/27  15:03:00  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.14  1995/08/15  11:16:39  quinn
  * Fixed pretty-printers.
  * CV:e ----------------------------------------------------------------------
  * CV:e ----------------------------------------------------------------------
@@ -92,18 +115,21 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
     char **tmp = 0;
     int size = 0, i;
 
-    if (!odr_sequence_begin(o, p, 0))
+    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 = odr_nullval();
 	    while (odr_sequence_more(o))
 	    {
 		/* outgrown array? */
-		if (*num * sizeof(void*) >= size)
+		if (*num * (int) sizeof(void*) >= size)
 		{
 		    /* double the buffer size */
 		    tmp = odr_malloc(o, sizeof(void*) * (size += size ? size :