Minor adjustments

[yaz-moved-to-github.git] / odr / odr_mem.c

diff --git a/odr/odr_mem.c b/odr/odr_mem.c
index e342625..3894907 100644 (file)
--- a/odr/odr_mem.c
+++ b/odr/odr_mem.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_mem.c,v $
- * Revision 1.8  1995-09-29 17:12:24  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
@@ -34,7 +43,7 @@
 
 #include <stdlib.h>
 #include <odr.h>
-#include <dmalloc.h>
+#include <xmalloc.h>
 
 /* ------------------------ NIBBLE MEMORY ---------------------- */
 
@@ -78,9 +87,9 @@ 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;
@@ -116,9 +125,16 @@ 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();
@@ -156,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);