X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2Fodr_mem.c;h=20768a55a68dc6374271cf294b7657f74dd11261;hp=95a8135ccc3b8f661196e0b7bb138b1fb4bca35d;hb=1b29df1d940a30bca2af0fb5c7e19961520bf230;hpb=aa82967af8f06004b567ad1ed40c67b056c44e7b

diff --git a/odr/odr_mem.c b/odr/odr_mem.c
index 95a8135..20768a5 100644
--- a/odr/odr_mem.c
+++ b/odr/odr_mem.c
@@ -1,10 +1,43 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
+ * Copyright (c) 1995-1998, Index Data
+ * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_mem.c,v $
- * Revision 1.3  1995-04-18 08:15:21  quinn
+ * Revision 1.14  1998-07-20 12:38:15  adam
+ * More LOG_DEBUG-diagnostics.
+ *
+ * Revision 1.13  1998/02/11 11:53:34  adam
+ * Changed code so that it compiles as C++.
+ *
+ * Revision 1.12  1995/11/08 17:41:33  quinn
+ * Smallish.
+ *
+ * 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
  * Added dynamic memory allocation on encoding (whew). Code is now somewhat
  * neater. We'll make the same change for decoding one day.
  *
@@ -19,85 +52,31 @@
 
 #include <stdlib.h>
 #include <odr.h>
+#include <xmalloc.h>
 
 /* ------------------------ NIBBLE MEMORY ---------------------- */
 
-#define ODR_MEM_CHUNK (10*1024)
-
-typedef struct odr_memblock
-{
-    char *buf;
-    int size;
-    int top;
-    struct odr_memblock *next;
-} odr_memblock;
-
-static odr_memblock *freelist = 0;
-
-static void free_block(odr_memblock *p)
-{
-    p->next = freelist;
-    freelist = p;
-}
-
-static odr_memblock *get_block(int size)
+/*
+ * Extract the memory control block from o.
+ */
+NMEM odr_extract_mem(ODR o)
 {
-    odr_memblock *r, *l;
+    NMEM r = o->mem;
 
-    for (r = freelist, l = 0; r; l = r, r = r->next)
-    	if (r->size >= size)
-	    break;
-    if (r)
-    	if (l)
-	    l->next = r->next;
-	else
-	    freelist = r->next;
-    else
-    {
-    	int get = ODR_MEM_CHUNK;
-
-	if (get < size)
-	    get = size;
-	if (!(r = malloc(sizeof(*r))))
-	    abort();
-	if (!(r->buf = malloc(r->size = get)))
-	    abort();
-    }
-    r->top = 0;
+    o->mem = 0;
     return r;
 }
 
-void odr_release_mem(odr_memblock *p)
+void *odr_malloc(ODR o, int size)
 {
-    odr_memblock *t;
-
-    while (p)
-    {
-    	t = p;
-	p = p->next;
-	free_block(t);
-    }
+    if (o && !o->mem)
+	o->mem = nmem_create();
+    return nmem_malloc(o ? o->mem : 0, size);
 }
 
-void *odr_malloc(ODR o, int size)
+int odr_total(ODR o)
 {
-    struct odr_memblock *p = o->mem;
-    char *r;
-
-    if (!p || p->size - p->top < size)
-    	if (!(p = get_block(size)))
-	{
-	    o->error = OMEMORY;
-	    return 0;
-	}
-	else
-	{
-	    p->next = o->mem;
-	    o->mem = p;
-	}
-    r = p->buf + p->top;
-    p->top += (size + (sizeof(long) - 1)) & ~(sizeof(long) - 1);
-    return r;
+    return o->mem ? nmem_total(o->mem) : 0;
 }
 
 /* ---------- memory management for data encoding ----------*/
@@ -115,9 +94,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 =(unsigned char *)xrealloc(b->buf, b->size += togrow)))
     	abort();
-    else if (!b->size && !(b->buf = malloc(b->size = togrow)))
+    else if (!b->size && !(b->buf = (unsigned char *)xmalloc(b->size = togrow)))
     	abort();
 #ifdef ODR_DEBUG
     fprintf(stderr, "New size for encode_buffer: %d\n", b->size);