X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_mem.c;h=38949070cbb7a9bb28dc78625633b02e869b3e2b;hp=01c96f6384b4c05cfadf95cedd7b25ce8e1a9813;hb=2004bbd9b3bbce5eb8ecc49520255b3d0bf578b9;hpb=84fdcc95fbd65091100b861671f410313e78eb0e

diff --git a/odr/odr_mem.c b/odr/odr_mem.c
index 01c96f6..3894907 100644
--- a/odr/odr_mem.c
+++ b/odr/odr_mem.c
@@ -1,10 +1,31 @@
 /*
- * 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_mem.c,v $
- * Revision 1.4  1995-05-15 11:56:09  quinn
+ * Revision 1.11  1995-11-01 13:54:43  quinn
+ * Minor adjustments
+ *
+ * Revision 1.10  1995/10/25  16:58:19  quinn
+ * Stupid bug in odr_malloc
+ *
+ * Revision 1.9  1995/10/13  16:08:08  quinn
+ * Added OID utility
+ *
+ * Revision 1.8  1995/09/29  17:12:24  quinn
+ * Smallish
+ *
+ * Revision 1.7  1995/09/27  15:02:59  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.6  1995/08/21  09:10:41  quinn
+ * Smallish fixes to suppport new formats.
+ *
+ * Revision 1.5  1995/05/16  08:50:55  quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.4  1995/05/15  11:56:09  quinn
  * More work on memory management.
  *
  * Revision 1.3  1995/04/18  08:15:21  quinn
@@ -22,7 +43,7 @@
 
 #include <stdlib.h>
 #include <odr.h>
-#include <dmalloc.h>
+#include <xmalloc.h>
 
 /* ------------------------ NIBBLE MEMORY ---------------------- */
 
@@ -33,6 +54,7 @@ typedef struct odr_memblock
     char *buf;
     int size;
     int top;
+    int total;
     struct odr_memblock *next;
 } odr_memblock;
 
@@ -65,12 +87,13 @@ static odr_memblock *get_block(int size)
 
 	if (get < size)
 	    get = size;
-	if (!(r = malloc(sizeof(*r))))
+	if (!(r = xmalloc(sizeof(*r))))
 	    abort();
-	if (!(r->buf = malloc(r->size = get)))
+	if (!(r->buf = xmalloc(r->size = get)))
 	    abort();
     }
     r->top = 0;
+    r->total = 0;
     return r;
 }
 
@@ -102,23 +125,38 @@ ODR_MEM odr_extract_mem(ODR o)
 
 void *odr_malloc(ODR o, int size)
 {
-    struct odr_memblock *p = o->mem;
+    struct odr_memblock *p;
     char *r;
 
+    if (!o)
+    {
+	if (!(r = xmalloc(size)))
+	    abort();
+	return r;
+    }
+    p = o->mem;
     if (!p || p->size - p->top < size)
     	if (!(p = get_block(size)))
 	    abort();
 	else
 	{
+	    if (o->mem)
+		p->total = o->mem->total;
 	    p->next = o->mem;
 	    o->mem = p;
 	}
     r = p->buf + p->top;
     /* align size */
     p->top += (size + (sizeof(long) - 1)) & ~(sizeof(long) - 1);
+    p->total += size;
     return r;
 }
 
+int odr_total(ODR o)
+{
+    return o->mem ? o->mem->total : 0;
+}
+
 /* ---------- memory management for data encoding ----------*/
 
 
@@ -134,9 +172,9 @@ int odr_grow_block(odr_ecblock *b, int min_bytes)
     	togrow = b->size;
     if (togrow < min_bytes)
     	togrow = min_bytes;
-    if (b->size && !(b->buf = realloc(b->buf, b->size += togrow)))
+    if (b->size && !(b->buf =xrealloc(b->buf, b->size += togrow)))
     	abort();
-    else if (!b->size && !(b->buf = malloc(b->size = togrow)))
+    else if (!b->size && !(b->buf = xmalloc(b->size = togrow)))
     	abort();
 #ifdef ODR_DEBUG
     fprintf(stderr, "New size for encode_buffer: %d\n", b->size);