Merge branch 'collectd-4.9' into collectd-4.10

[collectd.git] / src / csv.c

diff --git a/src/csv.c b/src/csv.c
index 78037a9..96c1e3e 100644 (file)
--- a/src/csv.c
+++ b/src/csv.c
@@ -246,16 +246,10 @@ static int csv_config (const char *key, const char *value)
        }
        else if (strcasecmp ("StoreRates", key) == 0)
        {
-               if ((strcasecmp ("True", value) == 0)
-                               || (strcasecmp ("Yes", value) == 0)
-                               || (strcasecmp ("On", value) == 0))
-               {
+               if (IS_TRUE (value))
                        store_rates = 1;
-               }
                else
-               {
                        store_rates = 0;
-               }
        }
        else
        {
@@ -305,7 +299,7 @@ static int csv_write (const data_set_t *ds, const value_list_t *vl,
 
                fprintf (use_stdio == 1 ? stdout : stderr,
                         "PUTVAL %s interval=%i %s\n",
-                        filename, interval_g, values);
+                        filename, vl->interval, values);
                return (0);
        }