X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_thread_safe.c;h=cc2cb5a3066c00127c84590895bba4e2a8eb6cb2;hb=3cd42d089914e0f63f97aa0369e674c7c19115cf;hp=223b586735695501819b4af39927c5a5f33471f3;hpb=298b318acaf1147474ab9e97cac37c3608660efd;p=rrdtool.git diff --git a/src/rrd_thread_safe.c b/src/rrd_thread_safe.c index 223b586..cc2cb5a 100644 --- a/src/rrd_thread_safe.c +++ b/src/rrd_thread_safe.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.1.x Copyright Tobias Oetiker, 1997 - 2002 + * RRDtool 1.2.16 Copyright by Tobi Oetiker, 1997-2006 * This file: Copyright 2003 Peter Stamfest * & Tobias Oetiker * Distributed under the GPL @@ -11,7 +11,7 @@ #include #include -#include +/* #include */ #include "rrd.h" #include "rrd_tool.h" @@ -54,12 +54,14 @@ const char *rrd_strerror(int err) { return strerror_r(err, ctx->lib_errstr, ctx->errlen); } #else +#undef strerror const char *rrd_strerror(int err) { static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER; struct rrd_context *ctx; ctx = rrd_get_context(); pthread_mutex_lock(&mtx); strncpy(ctx->lib_errstr, strerror(err), ctx->errlen); + ctx->lib_errstr[ctx->errlen]='\0'; pthread_mutex_unlock(&mtx); return ctx->lib_errstr; }