Code updates which makes things compile as C++. Mostly type casts were

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

diff --git a/src/odr_mem.c b/src/odr_mem.c
index e35de26..6a2ef68 100644 (file)
--- a/src/odr_mem.c
+++ b/src/odr_mem.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: odr_mem.c,v 1.5 2005-06-25 15:46:04 adam Exp $
+ * $Id: odr_mem.c,v 1.11 2007-05-06 20:12:20 adam Exp $
  */
 /**
  * \file odr_mem.c
@@ -25,21 +25,17 @@ NMEM odr_extract_mem(ODR o)
 {
     NMEM r = o->mem;
 
-    o->mem = 0;
+    o->mem = nmem_create();
     return r;
 }
 
 void *odr_malloc(ODR o, int size)
 {
-    if (o && !o->mem)
-        o->mem = nmem_create();
-    return nmem_malloc(o ? o->mem : 0, size);
+    return nmem_malloc(o->mem, size);
 }
 
 char *odr_strdup(ODR o, const char *str)
 {
-    if (o && !o->mem)
-        o->mem = nmem_create();
     return nmem_strdup(o->mem, str);
 }
 
@@ -50,14 +46,22 @@ char *odr_strdupn(ODR o, const char *str, size_t n)
 
 int *odr_intdup(ODR o, int v)
 {
-    if (o && !o->mem)
-        o->mem = nmem_create();
     return nmem_intdup(o->mem, v);
 }
 
 int odr_total(ODR o)
 {
-    return o->mem ? nmem_total(o->mem) : 0;
+    return nmem_total(o->mem);
+}
+
+Odr_oct *odr_create_Odr_oct(ODR o, const unsigned char *buf, int sz)
+{
+    Odr_oct *p = (Odr_oct *) odr_malloc(o, sizeof(Odr_oct));
+    p->buf = (unsigned char *) odr_malloc(o, sz);
+    memcpy(p->buf, buf, sz);
+    p->size = sz;
+    p->len = sz;
+    return p;
 }
 
 /* ---------- memory management for data encoding ----------*/
@@ -67,7 +71,7 @@ int odr_grow_block(ODR b, int min_bytes)
 {
     int togrow;
 
-    if (!b->can_grow)
+    if (!b->op->can_grow)
         return -1;
     if (!b->size)
         togrow = 1024;
@@ -81,9 +85,6 @@ int odr_grow_block(ODR b, int min_bytes)
     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);
-#endif
     return 0;
 }