Updated information about YAZ.

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

diff --git a/odr/odr_mem.c b/odr/odr_mem.c
index f0792d0..77af041 100644 (file)
--- a/odr/odr_mem.c
+++ b/odr/odr_mem.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (c) 1995, Index Data
+ * Copyright (c) 1995-1998, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_mem.c,v $
- * Revision 1.12  1995-11-08 17:41:33  quinn
+ * Revision 1.16  1999-11-30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.15  1999/03/31 11:18:25  adam
+ * Implemented odr_strdup. Added Reference ID to backend server API.
+ *
+ * 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
@@ -45,8 +57,8 @@
  */
 
 #include <stdlib.h>
-#include <odr.h>
-#include <xmalloc.h>
+#include <yaz/odr.h>
+#include <yaz/xmalloc.h>
 
 /* ------------------------ NIBBLE MEMORY ---------------------- */
 
@@ -68,6 +80,11 @@ void *odr_malloc(ODR o, int size)
     return nmem_malloc(o ? o->mem : 0, size);
 }
 
+char *odr_strdup(ODR o, const char *str)
+{
+    return nmem_strdup(o->mem, str);
+}
+
 int odr_total(ODR o)
 {
     return o->mem ? nmem_total(o->mem) : 0;
@@ -88,9 +105,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 =xrealloc(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 = xmalloc(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);