X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrdtool.c;h=d0849d12f1121c0c9b7809c9220b4d06f7591157;hb=25824c65721f0f21cadf1607fad367c7e7831816;hp=f6290d73ec451e2b2bcd5b2889942f6e8aa2079a;hpb=063e81d76677a3b52c5d8a1fbfbdf2bf87a75cee;p=collectd.git

diff --git a/src/rrdtool.c b/src/rrdtool.c
index f6290d73..d0849d12 100644
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -25,11 +25,11 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
+#include "utils/rrdcreate/rrdcreate.h"
 #include "utils_random.h"
-#include "utils_rrdcreate.h"
 
 #include <rrd.h>
 
@@ -569,7 +569,7 @@ static int rrd_cache_flush_identifier(cdtime_t timeout,
     snprintf(key, sizeof(key), "%s.rrd", identifier);
   else
     snprintf(key, sizeof(key), "%s/%s.rrd", datadir, identifier);
-  key[sizeof(key) - 1] = 0;
+  key[sizeof(key) - 1] = '\0';
 
   status = c_avl_get(cache, key, (void *)&rc);
   if (status != 0) {