X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_mem.c;h=9972c10052f4a5e088dc876db13729c5d5e97c8f;hp=e65af9ed8b0c3192f1a0fb5b8446c57de51e31eb;hb=0f073baf2183a54f2a5691e697fde68c9a5f50c5;hpb=d7cf0285e21b40c1fba6259d57bdabae94571bd5 diff --git a/src/odr_mem.c b/src/odr_mem.c index e65af9e..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. */ /** @@ -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