X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Frrdcached.c;h=34e860ba6dc72ccff994e7dc999ca79682292c63;hb=835a08771b95afec14114db407b86da33aa19558;hp=6295a53f79d39b67670de86066495790766a08fe;hpb=25ac639c505394e4ae9600ee62f5d5aeea97c6d4;p=collectd.git

diff --git a/src/rrdcached.c b/src/rrdcached.c
index 6295a53f..34e860ba 100644
--- a/src/rrdcached.c
+++ b/src/rrdcached.c
@@ -24,6 +24,8 @@
 #include "common.h"
 #include "utils_rrdcreate.h"
 
+#undef HAVE_CONFIG_H
+#include <rrd.h>
 #include <rrd_client.h>
 
 /*
@@ -77,7 +79,7 @@ static int value_list_to_string (char *buffer, int buffer_len,
     if ((ds->ds[i].type != DS_TYPE_COUNTER)
         && (ds->ds[i].type != DS_TYPE_GAUGE)
 	&& (ds->ds[i].type != DS_TYPE_DERIVE)
-	&& (ds->ds[i].type != DS_TYPE_ABSOLUTE)
+	&& (ds->ds[i].type != DS_TYPE_ABSOLUTE))
       return (-1);
 
     if (ds->ds[i].type == DS_TYPE_COUNTER)
@@ -88,15 +90,15 @@ static int value_list_to_string (char *buffer, int buffer_len,
     else if (ds->ds[i].type == DS_TYPE_GAUGE) 
     {
       status = ssnprintf (buffer + offset, buffer_len - offset,
-          ":%lf", vl->values[i].gauge);
+          ":%f", vl->values[i].gauge);
     }
     else if (ds->ds[i].type == DS_TYPE_DERIVE) {
       status = ssnprintf (buffer + offset, buffer_len - offset,
-	  ":%llu", vl->values[i].derive);
+	  ":%"PRIi64, vl->values[i].derive);
     }
     else /* if (ds->ds[i].type == DS_TYPE_ABSOLUTE) */ {
       status = ssnprintf (buffer + offset, buffer_len - offset,
-	  ":%llu", vl->values[i].absolute);
+	  ":%"PRIu64, vl->values[i].absolute);
  
     }
 
@@ -192,18 +194,14 @@ static int rc_config (const char *key, const char *value)
   }
   else if (strcasecmp ("CreateFiles", key) == 0)
   {
-    if ((strcasecmp ("false", value) == 0)
-        || (strcasecmp ("no", value) == 0)
-        || (strcasecmp ("off", value) == 0))
+    if (IS_FALSE (value))
       config_create_files = 0;
     else
       config_create_files = 1;
   }
   else if (strcasecmp ("CollectStatistics", key) == 0)
   {
-    if ((strcasecmp ("false", value) == 0)
-        || (strcasecmp ("no", value) == 0)
-        || (strcasecmp ("off", value) == 0))
+    if (IS_FALSE (value))
       config_collect_stats = 0;
     else
       config_collect_stats = 1;