X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Frrdtool.c;h=5c87a4346046b11d1a6f6c48a728ffe20051b0b0;hp=e3ad07e23abf402b40abf2552f8280a6a2bd9d4e;hb=d486225f89ea52d8ed2b4242eba2ad94c409f837;hpb=358bf39b09f69220fc8e1b6c2fe98e5e185e3364 diff --git a/src/rrdtool.c b/src/rrdtool.c index e3ad07e2..5c87a434 100644 --- a/src/rrdtool.c +++ b/src/rrdtool.c @@ -66,8 +66,8 @@ static int config_keys_num = STATIC_ARRAY_SIZE(config_keys); /* If datadir is zero, the daemon's basedir is used. If stepsize or heartbeat * is zero a default, depending on the `interval' member of the value list is * being used. */ -static char *datadir = NULL; -static double write_rate = 0.0; +static char *datadir; +static double write_rate; static rrdcreate_config_t rrdcreate_config = { /* stepsize = */ 0, /* heartbeat = */ 0, @@ -84,17 +84,17 @@ static rrdcreate_config_t rrdcreate_config = { /* XXX: If you need to lock both, cache_lock and queue_lock, at the same time, * ALWAYS lock `cache_lock' first! */ -static cdtime_t cache_timeout = 0; -static cdtime_t cache_flush_timeout = 0; -static cdtime_t random_timeout = 0; +static cdtime_t cache_timeout; +static cdtime_t cache_flush_timeout; +static cdtime_t random_timeout; static cdtime_t cache_flush_last; -static c_avl_tree_t *cache = NULL; +static c_avl_tree_t *cache; static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER; -static rrd_queue_t *queue_head = NULL; -static rrd_queue_t *queue_tail = NULL; -static rrd_queue_t *flushq_head = NULL; -static rrd_queue_t *flushq_tail = NULL; +static rrd_queue_t *queue_head; +static rrd_queue_t *queue_tail; +static rrd_queue_t *flushq_head; +static rrd_queue_t *flushq_tail; static pthread_t queue_thread; static int queue_thread_running = 1; static pthread_mutex_t queue_lock = PTHREAD_MUTEX_INITIALIZER; @@ -104,7 +104,7 @@ static pthread_cond_t queue_cond = PTHREAD_COND_INITIALIZER; static pthread_mutex_t librrd_lock = PTHREAD_MUTEX_INITIALIZER; #endif -static int do_shutdown = 0; +static int do_shutdown; #if HAVE_THREADSAFE_LIBRRD static int srrd_update(char *filename, char *template, int argc, @@ -1010,7 +1010,7 @@ static int rrd_shutdown(void) { } /* int rrd_shutdown */ static int rrd_init(void) { - static int init_once = 0; + static int init_once; if (init_once != 0) return 0;