X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fodr_mem.c;h=4309d3da5a0b445f6d5c8f21e16612b9d4568baa;hb=1b750a9f8ea0d258fde61f5bac2d5af5bd783eb0;hp=55478c0c033262ecd54ad5121b0cca9c22b86f27;hpb=379504a233e3e2cc85bca1e7b6d864f1395aec7c;p=yaz-moved-to-github.git

diff --git a/src/odr_mem.c b/src/odr_mem.c
index 55478c0..4309d3d 100644
--- a/src/odr_mem.c
+++ b/src/odr_mem.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2013 Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -27,7 +27,7 @@ NMEM odr_extract_mem(ODR o)
     return r;
 }
 
-void *odr_malloc(ODR o, int size)
+void *odr_malloc(ODR o, size_t size)
 {
     return nmem_malloc(o->mem, size);
 }
@@ -47,12 +47,17 @@ 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)
 {
     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);
 }
@@ -91,7 +96,7 @@ int odr_grow_block(ODR b, int min_bytes)
     return 0;
 }
 
-int odr_write(ODR o, unsigned char *buf, int bytes)
+int odr_write2(ODR o, const char *buf, int bytes)
 {
     if (o->pos + bytes >= o->size && odr_grow_block(o, bytes))
     {
@@ -105,6 +110,11 @@ int odr_write(ODR o, unsigned char *buf, int bytes)
     return 0;
 }
 
+int odr_write(ODR o, unsigned char *buf, int bytes)
+{
+    return odr_write2(o, (char *) buf, bytes);
+}
+
 int odr_seek(ODR o, int whence, int offset)
 {
     if (whence == ODR_S_CUR)
@@ -119,6 +129,27 @@ int odr_seek(ODR o, int whence, int offset)
     o->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