X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fodr_mem.c;h=555c4435c0e0f92aaaf384ee57e5cce67b936fb8;hb=b56aa5c8101fb7474791acd8aedfec0801e57049;hp=6a2ef688288c99a8c3c0ec67fc8d4407c1eaa75f;hpb=fe507b6b15788a3a8e58063d9dae52532a5229a5;p=yaz-moved-to-github.git diff --git a/src/odr_mem.c b/src/odr_mem.c index 6a2ef68..555c443 100644 --- a/src/odr_mem.c +++ b/src/odr_mem.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2009 Index Data * See the file LICENSE for details. - * - * $Id: odr_mem.c,v 1.11 2007-05-06 20:12:20 adam Exp $ */ /** * \file odr_mem.c @@ -39,16 +37,26 @@ char *odr_strdup(ODR o, const char *str) return nmem_strdup(o->mem, str); } +char *odr_strdup_null(ODR o, const char *str) +{ + return nmem_strdup_null(o->mem, str); +} + 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); @@ -116,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