X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fodr_mem.c;h=555c4435c0e0f92aaaf384ee57e5cce67b936fb8;hb=82a298086b4a8f1988e45aeb8e52494f05ebc3e7;hp=c970f6b6baee2a431ed29b3595545ef08d192f88;hpb=ee6ab2ee3a9ee1a8c65d7272ec7fba1d886f5af0;p=yaz-moved-to-github.git diff --git a/src/odr_mem.c b/src/odr_mem.c index c970f6b..555c443 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-2008 Index Data + * Copyright (C) 1995-2009 Index Data * See the file LICENSE for details. */ /** @@ -47,11 +47,16 @@ 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); } +Odr_bool *odr_booldup(ODR o, Odr_bool v) +{ + return nmem_booldup(o->mem, v); +} + int odr_total(ODR o) { return nmem_total(o->mem); @@ -119,9 +124,26 @@ int odr_seek(ODR o, int whence, int offset) o->pos = offset; return 0; } + +Odr_int odr_atoi(const char *s) +{ +#if NMEM_64 + char *endptr; +#if WIN32 + return _strtoui64(s, &endptr, 10); +#else + return strtoll(s, &endptr, 10); +#endif + +#else + return atoi(s); +#endif +} + /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab