X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_seq.c;h=c03df9599b6e64f34d6a4f5959f2e3bd0c348f76;hb=475b8ce3047108dcf7a87251733299077d7001e7;hp=7597d28b9cbc486a08a449920ae6e506da690693;hpb=bf4149c63ad2e11429e302a89f472de52b4d7ce8;p=yaz-moved-to-github.git

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index 7597d28..c03df95 100644
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -1,10 +1,23 @@
 /*
- * 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.18  1997-05-14 06:53:58  adam
+ * 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
+ * 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
@@ -82,7 +95,7 @@ int odr_sequence_begin(ODR o, void *p, int size)
     if (odr_constructed_begin(o, p, o->t_class, o->t_tag))
     {
     	if (o->direction == ODR_DECODE && size)
-	    *pp = odr_malloc(o, size);
+	    *pp = (char *)odr_malloc(o, size);
     	return 1;
     }
     else
@@ -105,21 +118,24 @@ 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 = (char **)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 :
+		    tmp = (char **)odr_malloc(o, sizeof(void*) * (size += size ? size :
 			128));
 		    if (*num)
 		    {