prepare for the release of rrdtool-1.4.2

[rrdtool.git] / src / rrd_error.c

diff --git a/src/rrd_error.c b/src/rrd_error.c
index bbc66b9..5408d6c 100644 (file)
--- a/src/rrd_error.c
+++ b/src/rrd_error.c
@@ -1,10 +1,27 @@
 /*****************************************************************************
- * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2002
+ * RRDtool 1.4.2  Copyright by Tobi Oetiker, 1997-2009
  *****************************************************************************
  * rrd_error.c   Common Header File
  *****************************************************************************
  * $Id$
  * $Log$
+ * Revision 1.4  2003/02/22 21:57:03  oetiker
+ * a patch to avoid a memory leak and a Makefile.am patch to
+ * distribute all required source files -- Peter Stamfest <peter@stamfest.at>
+ *
+ * Revision 1.3  2003/02/13 07:05:27  oetiker
+ * Find attached the patch I promised to send to you. Please note that there
+ * are three new source files (src/rrd_is_thread_safe.h, src/rrd_thread_safe.c
+ * and src/rrd_not_thread_safe.c) and the introduction of librrd_th. This
+ * library is identical to librrd, but it contains support code for per-thread
+ * global variables currently used for error information only. This is similar
+ * to how errno per-thread variables are implemented.  librrd_th must be linked
+ * alongside of libpthred
+ *
+ * There is also a new file "THREADS", holding some documentation.
+ *
+ * -- Peter Stamfest <peter@stamfest.at>
+ *
  * Revision 1.2  2002/02/01 20:34:49  oetiker
  * fixed version number and date/time
  *
@@ -13,49 +30,122 @@
  *
  *************************************************************************** */
 
-#include "rrd_tool.h"
-#define MAXLEN 4096
-static char rrd_error[MAXLEN] = "\0";
+#include <stdlib.h>
 #include <stdarg.h>
 
+#include "rrd_tool.h"
 
+#define MAXLEN 4096
+#define ERRBUFLEN 256
+#define CTX (rrd_get_context())
 
-void
-rrd_set_error(char *fmt, ...)
+void rrd_set_error(
+    char *fmt,
+    ...)
 {
-    va_list argp;
+    va_list   argp;
+
     rrd_clear_error();
     va_start(argp, fmt);
 #ifdef HAVE_VSNPRINTF
-    vsnprintf((char *)rrd_error, MAXLEN-1, fmt, argp);
+    vsnprintf(CTX->rrd_error, sizeof(CTX->rrd_error), fmt, argp);
 #else
-    vsprintf((char *)rrd_error, fmt, argp);
+    vsprintf(CTX->rrd_error, fmt, argp);
 #endif
     va_end(argp);
 }
 
-int
-rrd_test_error(void) {
-    return rrd_error[0] != '\0';
+int rrd_test_error(
+    void)
+{
+    return CTX->rrd_error[0] != '\0';
 }
 
-void
-rrd_clear_error(void){
-    rrd_error[0] = '\0';
+void rrd_clear_error(
+    void)
+{
+    CTX->rrd_error[0] = '\0';
 }
 
-char *
-rrd_get_error(void){
-    return (char *)rrd_error;
+char     *rrd_get_error(
+    void)
+{
+    return CTX->rrd_error;
 }
 
+#if 0
+/* PS: Keep this stuff around, maybe we want it again if we use
+   rrd_contexts to really associate them with single RRD files and
+   operations on them... Then a single thread may use more than one
+   context. Using these functions would require to change each and
+   every function containing any of the non _r versions... */
+void rrd_set_error_r(
+    rrd_context_t * rrd_ctx,
+    char *fmt,
+    ...)
+{
+    va_list   argp;
 
+    rrd_clear_error_r(rrd_ctx);
+    va_start(argp, fmt);
+#ifdef HAVE_VSNPRINTF
+    vsnprintf(rrd_ctx->rrd_error, sizeof(rrd_ctx->rrd_error), fmt, argp);
+    rrd_ctx->rrd_error[sizeof(rrd_ctx->rrd_error) - 1] = '\0';
+#else
+    vsprintf(rrd_ctx->rrd_error, fmt, argp);
+#endif
+    va_end(argp);
+}
 
+int rrd_test_error_r(
+    rrd_context_t * rrd_ctx)
+{
+    return rrd_ctx->rrd_error[0] != '\0';
+}
 
+void rrd_clear_error_r(
+    rrd_context_t * rrd_ctx)
+{
+    rrd_ctx->rrd_error[0] = '\0';
+}
 
+char     *rrd_get_error_r(
+    rrd_context_t * rrd_ctx)
+{
+    return rrd_ctx->rrd_error;
+}
+#endif
 
+/* PS: Should we move this to some other file? It is not really error
+   related. */
+rrd_context_t *rrd_new_context(
+    void)
+{
+    rrd_context_t *rrd_ctx = (rrd_context_t *) malloc(sizeof(rrd_context_t));
 
+    if (!rrd_ctx) {
+        return NULL;
+    }
 
+    rrd_ctx->rrd_error[0] = '\0';
+    rrd_ctx->lib_errstr[0] = '\0';
+    return rrd_ctx;
+}
 
+void rrd_free_context(
+    rrd_context_t * rrd_ctx)
+{
+    if (rrd_ctx) {
+        free(rrd_ctx);
+    }
+}
 
-
+#if 0
+void rrd_globalize_error(
+    rrd_context_t * rrd_ctx)
+{
+    if (rrd_ctx) {
+        rrd_set_error(rrd_ctx->rrd_error);
+    }
+}
+#endif