Merge branch 'upstream-1.3' into experimental

[pkg-rrdtool.git] / src / rrd_not_thread_safe.c

diff --git a/src/rrd_not_thread_safe.c b/src/rrd_not_thread_safe.c
index 7504d6eff4f68bdd12cde91542911bc2094c70d5..9616b6ab40fefd99aee2f8c171a4c87c95734f8e 100644 (file)
--- a/src/rrd_not_thread_safe.c
+++ b/src/rrd_not_thread_safe.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.26  Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.3rc6  Copyright by Tobi Oetiker, 1997-2008
  * This file:     Copyright 2003 Peter Stamfest <peter@stamfest.at> 
  *                             & Tobias Oetiker
  * Distributed under the GPL
@@ -7,32 +7,36 @@
  * rrd_not_thread_safe.c   Contains routines used when thread safety is not
  *                         an issue
  *****************************************************************************
- * $Id: rrd_not_thread_safe.c 1235 2007-11-20 00:15:07Z oetiker $
+ * $Id: rrd_not_thread_safe.c 1380 2008-05-26 08:56:58Z oetiker $
  *************************************************************************** */
 #include "rrd.h"
 #include "rrd_tool.h"
 #define MAXLEN 4096
 #define ERRBUFLEN 256
 
-static char rrd_error[MAXLEN+10];
-static char rrd_liberror[ERRBUFLEN+10];
-static int  rrd_context_init = 0;
+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 <stdarg.h> */
 
-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';
+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;
 }
@@ -42,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);
 }