X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_not_thread_safe.c;h=0d3ddbe3098ed6e60ef93562b8eaa88a44d29c87;hp=3cb93bcd314bc6355c526a9eeb74f05d550c8fbb;hb=4ac4f3f1155702ed4d4b021eed20ff64a09a6549;hpb=734468bcc23497c7eba0deba87c92aa219fd46d1 diff --git a/src/rrd_not_thread_safe.c b/src/rrd_not_thread_safe.c index 3cb93bc..0d3ddbe 100644 --- a/src/rrd_not_thread_safe.c +++ b/src/rrd_not_thread_safe.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.17 Copyright by Tobi Oetiker, 1997-2006 + * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010 * This file: Copyright 2003 Peter Stamfest * & Tobias Oetiker * Distributed under the GPL @@ -14,26 +14,19 @@ #define MAXLEN 4096 #define ERRBUFLEN 256 -static char rrd_error[MAXLEN+10]; -static char rrd_liberror[ERRBUFLEN+10]; -static int rrd_context_init = 0; /* The global context is very useful in the transition period to even more thread-safe stuff, it can be used whereever we need a context and do not need to worry about concurrency. */ -static struct rrd_context global_ctx = { - MAXLEN, - ERRBUFLEN, - rrd_error, - rrd_liberror +static rrd_context_t global_ctx = { + "", + "" }; + /* #include */ -struct rrd_context *rrd_get_context(void) { - if (! rrd_context_init ){ - rrd_context_init = 1; - global_ctx.rrd_error[0]='\0'; - global_ctx.lib_errstr[0]='\0'; - } +rrd_context_t *rrd_get_context( + void) +{ return &global_ctx; } @@ -42,6 +35,8 @@ struct rrd_context *rrd_get_context(void) { silently turning misplaced strerror into rrd_strerror, but here this turns recursive! */ #undef strerror -const char *rrd_strerror(int err) { +const char *rrd_strerror( + int err) +{ return strerror(err); }