X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_not_thread_safe.c;h=4558122977ac01ef714623b28861a6da166b214a;hb=2f9c0721d1f7e9eceae3d04e197d0e4a46eeb3b1;hp=7022277064639a2ed84a3df707e462957dbfd5b5;hpb=eaa7cd6040fe27ced6746492a55174d6f0b034d5;p=rrdtool.git diff --git a/src/rrd_not_thread_safe.c b/src/rrd_not_thread_safe.c index 7022277..4558122 100644 --- a/src/rrd_not_thread_safe.c +++ b/src/rrd_not_thread_safe.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.2.15 Copyright by Tobi Oetiker, 1997-2006 + * RRDtool 1.2.99907080300 Copyright by Tobi Oetiker, 1997-2007 * This file: Copyright 2003 Peter Stamfest * & Tobias Oetiker * Distributed under the GPL @@ -14,20 +14,30 @@ #define MAXLEN 4096 #define ERRBUFLEN 256 -static char rrd_error[MAXLEN+10]; -static char rrd_liberror[ERRBUFLEN+10]; +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_error, rrd_liberror }; + /* #include */ -struct rrd_context *rrd_get_context(void) { +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'; + } return &global_ctx; } @@ -36,6 +46,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); }