X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_mem.c;h=690477db393f1af6d7bd0fdec0b18b8c4ce6a1ca;hp=2bd75ee14111b2a6431f69a19c7cb90019f0d1b3;hb=4db187fbff08310195d08260817d7aa63f1fa4bc;hpb=4c176312acdc3444c9afc820f76a393e64668e52

diff --git a/src/odr_mem.c b/src/odr_mem.c
index 2bd75ee..690477d 100644
--- a/src/odr_mem.c
+++ b/src/odr_mem.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
- *
- * $Id: odr_mem.c,v 1.4 2005-01-15 19:47:14 adam Exp $
  */
 /**
  * \file odr_mem.c
@@ -25,39 +23,53 @@ 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)
+void *odr_malloc(ODR o, size_t 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);
 }
 
+char *odr_strdup_null(ODR o, const char *str)
+{
+    return nmem_strdup_null(o->mem, str);
+}
+
 char *odr_strdupn(ODR o, const char *str, size_t n)
 {
     return nmem_strdupn(o->mem, str, n);
 }
 
-int *odr_intdup(ODR o, int v)
+Odr_int *odr_intdup(ODR o, Odr_int v)
 {
-    if (o && !o->mem)
-	o->mem = nmem_create();
     return nmem_intdup(o->mem, v);
 }
 
-int odr_total(ODR o)
+Odr_bool *odr_booldup(ODR o, Odr_bool v)
+{
+    return nmem_booldup(o->mem, v);
+}
+
+size_t odr_total(ODR o)
+{
+    return nmem_total(o->mem);
+}
+
+Odr_oct *odr_create_Odr_oct(ODR o, const char *buf, int sz)
 {
-    return o->mem ? nmem_total(o->mem) : 0;
+    Odr_oct *p = (Odr_oct *) odr_malloc(o, sizeof(Odr_oct));
+    p->buf = (char *) odr_malloc(o, sz + 1);
+    memcpy(p->buf, buf, sz);
+    p->buf[sz] = '\0';
+    p->len = sz;
+    return p;
 }
 
 /* ---------- memory management for data encoding ----------*/
@@ -67,51 +79,78 @@ int odr_grow_block(ODR b, int min_bytes)
 {
     int togrow;
 
-    if (!b->can_grow)
-    	return -1;
-    if (!b->size)
-    	togrow = 1024;
+    if (!b->op->can_grow)
+        return -1;
+    if (!b->op->size)
+        togrow = 1024;
     else
-    	togrow = b->size;
+        togrow = b->op->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
+        togrow = min_bytes;
+    if (b->op->size && !(b->op->buf =
+                     (char *) xrealloc(b->op->buf, b->op->size += togrow)))
+        abort();
+    else if (!b->op->size && !(b->op->buf = (char *)
+                               xmalloc(b->op->size = togrow)))
+        abort();
     return 0;
 }
 
-int odr_write(ODR o, unsigned char *buf, int bytes)
+int odr_write(ODR o, const char *buf, int bytes)
 {
-    if (o->pos + bytes >= o->size && odr_grow_block(o, bytes))
+    if (o->op->pos + bytes >= o->op->size && odr_grow_block(o, bytes))
     {
         odr_seterror(o, OSPACE, 40);
-	return -1;
+        return -1;
     }
-    memcpy(o->buf + o->pos, buf, bytes);
-    o->pos += bytes;
-    if (o->pos > o->top)
-    	o->top = o->pos;
+    memcpy(o->op->buf + o->op->pos, buf, bytes);
+    o->op->pos += bytes;
+    if (o->op->pos > o->op->top)
+        o->op->top = o->op->pos;
     return 0;
 }
 
 int odr_seek(ODR o, int whence, int offset)
 {
     if (whence == ODR_S_CUR)
-    	offset += o->pos;
+        offset += o->op->pos;
     else if (whence == ODR_S_END)
-    	offset += o->top;
-    if (offset > o->size && odr_grow_block(o, offset - o->size))
+        offset += o->op->top;
+    if (offset > o->op->size && odr_grow_block(o, offset - o->op->size))
     {
         odr_seterror(o, OSPACE, 41);
-	return -1;
+        return -1;
     }
-    o->pos = offset;
+    o->op->pos = offset;
     return 0;
 }
+
+Odr_int odr_strtol(const char *nptr, char **endptr, int base)
+{
+#if NMEM_64
+#if WIN32
+    return _strtoui64(nptr, endptr, base);
+#else
+    return strtoll(nptr, endptr, base);
+#endif
+
+#else
+    return strtol(nptr, endptr, base);
+#endif
+}
+
+Odr_int odr_atoi(const char *s)
+{
+    char *endptr;
+    return odr_strtol(s, &endptr, 10);
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+