X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr_mem.c;h=9b2c7cc0afb3fe969007681e652b056103cd4932;hb=9287c96097c00d28310becb14ea3dd7cfb9f2ab0;hp=4d6bf6d153b0558ca32c563a3a1067619548ebe2;hpb=b3500b4a0d2b4bb25bb6d4e9ab72e0e488655da6;p=yaz-moved-to-github.git

diff --git a/odr/odr_mem.c b/odr/odr_mem.c
index 4d6bf6d..9b2c7cc 100644
--- a/odr/odr_mem.c
+++ b/odr/odr_mem.c
@@ -1,21 +1,104 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: odr_mem.c,v $
- * Revision 1.1  1995-03-14 10:27:40  quinn
- * Modified makefile to use common lib
- * Beginning to add memory management to odr
- *
+ * Copyright (c) 1995-2002, Index Data
+ * See the file LICENSE for details.
  *
+ * $Id: odr_mem.c,v 1.20 2002-07-25 12:51:08 adam Exp $
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <stdlib.h>
+#include "odr-priv.h"
+#include <yaz/xmalloc.h>
+
+/* ------------------------ NIBBLE MEMORY ---------------------- */
+
+/*
+ * Extract the memory control block from o.
+ */
+NMEM odr_extract_mem(ODR o)
+{
+    NMEM r = o->mem;
+
+    o->mem = 0;
+    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);
+}
+
+char *odr_strdup(ODR o, const char *str)
+{
+    return nmem_strdup(o->mem, str);
+}
 
-#include <odr.h>
+int *odr_intdup(ODR o, int v)
+{
+    return nmem_intdup(o->mem, v);
+}
+
+int odr_total(ODR o)
+{
+    return o->mem ? nmem_total(o->mem) : 0;
+}
+
+/* ---------- memory management for data encoding ----------*/
+
+
+int odr_grow_block(ODR b, int min_bytes)
+{
+    int togrow;
+
+    if (!b->can_grow)
+    	return -1;
+    if (!b->size)
+    	togrow = 1024;
+    else
+    	togrow = b->size;
+    if (togrow < min_bytes)
+    	togrow = min_bytes;
+    if (b->size && !(b->buf =
+		     (unsigned char *) xrealloc(b->buf, b->size += togrow)))
+    	abort();
+    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;
+}
+
+int odr_write(ODR o, unsigned char *buf, int bytes)
+{
+    if (o->pos + bytes >= o->size && odr_grow_block(o, bytes))
+    {
+    	o->error = OSPACE;
+	return -1;
+    }
+    memcpy(o->buf + o->pos, buf, bytes);
+    o->pos += bytes;
+    if (o->pos > o->top)
+    	o->top = o->pos;
+    return 0;
+}
 
-char *odr_malloc(ODR o, int size)
+int odr_seek(ODR o, int whence, int offset)
 {
-    return malloc(size); /* REPLACE WITH NIBBLE MALLOC!! */
+    if (whence == ODR_S_CUR)
+    	offset += o->pos;
+    else if (whence == ODR_S_END)
+    	offset += o->top;
+    if (offset > o->size && odr_grow_block(o, offset - o->size))
+    {
+    	o->error = OSPACE;
+	return -1;
+    }
+    o->pos = offset;
+    return 0;
 }