X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fodr_mem.c;h=e0c7a72c49e88b21a794cc4dd7c27a56d9d72157;hb=5bc2ee09e4dff0f872ce738a5327bced915e3474;hp=88f012cc42f758bce563174b4854a3a88bdb698f;hpb=88d3bedf772316f87e1996f655ccf8d1e2589755;p=yaz-moved-to-github.git diff --git a/src/odr_mem.c b/src/odr_mem.c index 88f012c..e0c7a72 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-2010 Index Data + * Copyright (C) 1995-2012 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