X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_error.c;h=d816c22fcc8b22c69be019c1e7682142f08474b5;hp=e64e2df1179b01a05a20b578132a07c3f9e54fef;hb=75b8cf7a1eff3d24a8567f3209aa023ad4473e95;hpb=b005d2cbe00924ddfcb8766d49201e4044abfc21 diff --git a/src/rrd_error.c b/src/rrd_error.c index e64e2df..d816c22 100644 --- a/src/rrd_error.c +++ b/src/rrd_error.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.3rc7 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_error.c Common Header File ***************************************************************************** @@ -30,9 +30,11 @@ * *************************************************************************** */ -#include "rrd_tool.h" +#include #include +#include "rrd_tool.h" + #define MAXLEN 4096 #define ERRBUFLEN 256 #define CTX (rrd_get_context()) @@ -78,7 +80,7 @@ char *rrd_get_error( context. Using these functions would require to change each and every function containing any of the non _r versions... */ void rrd_set_error_r( - struct rrd_context *rrd_ctx, + rrd_context_t * rrd_ctx, char *fmt, ...) { @@ -96,19 +98,19 @@ void rrd_set_error_r( } int rrd_test_error_r( - struct rrd_context *rrd_ctx) + rrd_context_t * rrd_ctx) { return rrd_ctx->rrd_error[0] != '\0'; } void rrd_clear_error_r( - struct rrd_context *rrd_ctx) + rrd_context_t * rrd_ctx) { rrd_ctx->rrd_error[0] = '\0'; } char *rrd_get_error_r( - struct rrd_context *rrd_ctx) + rrd_context_t * rrd_ctx) { return rrd_ctx->rrd_error; } @@ -116,13 +118,12 @@ char *rrd_get_error_r( /* PS: Should we move this to some other file? It is not really error related. */ -struct rrd_context *rrd_new_context( +rrd_context_t *rrd_new_context( void) { - struct rrd_context *rrd_ctx = - (struct rrd_context *) malloc(sizeof(struct rrd_context)); + rrd_context_t *rrd_ctx = (rrd_context_t *) malloc(sizeof(rrd_context_t)); - if (! rrd_ctx) { + if (!rrd_ctx) { return NULL; } @@ -132,7 +133,7 @@ struct rrd_context *rrd_new_context( } void rrd_free_context( - struct rrd_context *rrd_ctx) + rrd_context_t * rrd_ctx) { if (rrd_ctx) { free(rrd_ctx); @@ -141,7 +142,7 @@ void rrd_free_context( #if 0 void rrd_globalize_error( - struct rrd_context *rrd_ctx) + rrd_context_t * rrd_ctx) { if (rrd_ctx) { rrd_set_error(rrd_ctx->rrd_error);