X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fnmem.c;h=93988b55b5db1f9f350e42745d409c0a561bb7a5;hb=273716ada4a96213fb99182df2a3ee22509437b0;hp=9ad8c28617d29579c09dfab7399f17f511d889a1;hpb=dc4414aeda179bc8ebe3fc46ac53e4a24d265d16;p=yaz-moved-to-github.git diff --git a/src/nmem.c b/src/nmem.c index 9ad8c28..93988b5 100644 --- a/src/nmem.c +++ b/src/nmem.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: nmem.c,v 1.30 2007-04-17 20:26:18 adam Exp $ */ /** @@ -28,10 +26,6 @@ #include #include -#ifdef WIN32 -#include -#endif - #define NMEM_CHUNK (4*1024) struct nmem_block @@ -186,64 +180,10 @@ void nmem_transfer (NMEM dst, NMEM src) src->total = 0; } -int yaz_errno(void) -{ - return errno; -} - -void yaz_set_errno(int v) -{ - errno = v; -} - -void yaz_strerror(char *buf, int max) -{ -#ifdef WIN32 - DWORD err; -#endif - char *cp; - if (!log_level_initialized) - { - log_level = yaz_log_module_level("nmem"); - log_level_initialized = 1; - } - -#ifdef WIN32 - err = GetLastError(); - if (err) - { - FormatMessage( - FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - err, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default lang */ - (LPTSTR) buf, - max-1, - NULL); - } - else - *buf = '\0'; -#else -/* UNIX */ -#if HAVE_STRERROR_R - *buf = '\0'; - strerror_r(errno, buf, max); - /* if buffer is unset - use strerror anyway (GLIBC bug) */ - if (*buf == '\0') - strcpy(buf, strerror(yaz_errno())); -#else - strcpy(buf, strerror(yaz_errno())); -#endif -/* UNIX */ -#endif - if ((cp = strrchr(buf, '\n'))) - *cp = '\0'; - if ((cp = strrchr(buf, '\r'))) - *cp = '\0'; -} /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab