X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_mem.c;h=9972c10052f4a5e088dc876db13729c5d5e97c8f;hp=555c4435c0e0f92aaaf384ee57e5cce67b936fb8;hb=f2891d8771cb23cc70d973c6785bec20e31f511e;hpb=6278ee39573b69b59333a876c52671d0ebbca320

diff --git a/src/odr_mem.c b/src/odr_mem.c
index 555c443..9972c10 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-2010 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);
 }
@@ -57,7 +57,7 @@ Odr_bool *odr_booldup(ODR o, Odr_bool v)
     return nmem_booldup(o->mem, v);
 }
 
-int odr_total(ODR o)
+size_t odr_total(ODR o)
 {
     return nmem_total(o->mem);
 }
@@ -125,21 +125,26 @@ int odr_seek(ODR o, int whence, int offset)
     return 0;
 }
 
-Odr_int odr_atoi(const char *s)
+Odr_int odr_strtol(const char *nptr, char **endptr, int base)
 {
 #if NMEM_64
-    char *endptr;
 #if WIN32
-    return _strtoui64(s, &endptr, 10);
+    return _strtoui64(nptr, endptr, base);
 #else
-    return strtoll(s, &endptr, 10);
+    return strtoll(nptr, endptr, base);
 #endif
 
 #else
-    return atoi(s);
+    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