X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_seq.c;h=bb55971238a94417e549f3d56e4f68b2dcd44c79;hb=d4c07f5246e1fe90fb79aaf44a5baccf00140221;hp=cb3d703aea6520ca1f751657cadde99ae95e0533;hpb=70efa832d93f63e4fe7de44b666f3b66ae87c23f;p=yaz-moved-to-github.git

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index cb3d703..bb55971 100644
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_seq.c,v $
- * Revision 1.8  1995-03-15 11:18:05  quinn
+ * Revision 1.12  1995-05-18 13:06:32  quinn
+ * Smallish.
+ *
+ * Revision 1.11  1995/05/17  08:41:54  quinn
+ * Small, hopefully insignificant change.
+ *
+ * Revision 1.10  1995/05/16  08:50:59  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.9  1995/03/17  10:17:57  quinn
+ * Added memory management.
+ *
+ * Revision 1.8  1995/03/15  11:18:05  quinn
  * Fixed serious bug in odr_cons
  *
  * Revision 1.7  1995/03/08  12:12:30  quinn
@@ -49,7 +61,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 = nalloc(o, size);
+	    *pp = odr_malloc(o, size);
 	if (o->direction == ODR_PRINT)
 	{
 	    fprintf(o->print, "%s{\n", odr_indent(o));
@@ -81,10 +93,9 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
 {
     char ***pp = (char***) p;  /* for dereferencing */
     char **tmp;
-    char *dummy = "Nothing";
     int size = 0, i;
 
-    if (!odr_sequence_begin(o, &dummy, 0))
+    if (!odr_sequence_begin(o, p, 0))
     	return 0;
 
     switch (o->direction)
@@ -97,7 +108,7 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
 		if (*num * sizeof(void*) >= size)
 		{
 		    /* double the buffer size */
-		    tmp = nalloc(o, sizeof(void*) * (size += size ? size :
+		    tmp = odr_malloc(o, sizeof(void*) * (size += size ? size :
 			128));
 		    if (*num)
 		    {