X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fcsv.c;h=7b513e7345199a508fc53531187aac959784c74b;hb=4825cf6e51535f5c1550bc753bbc2f5161905543;hp=e9a409d8c1cdf7643ab0025e6458dfdacaadba68;hpb=68108d7b5688f4db5257a90437e50428a88d594a;p=collectd.git diff --git a/src/csv.c b/src/csv.c index e9a409d8..7b513e73 100644 --- a/src/csv.c +++ b/src/csv.c @@ -25,7 +25,6 @@ #include "plugin.h" #include "common.h" #include "utils_cache.h" -#include "utils_parse_option.h" /* * Private variables @@ -46,7 +45,7 @@ static int value_list_to_string (char *buffer, int buffer_len, { int offset; int status; - int i; + size_t i; gauge_t *rates = NULL; assert (0 == strcmp (ds->type, vl->type)); @@ -65,13 +64,16 @@ static int value_list_to_string (char *buffer, int buffer_len, && (ds->ds[i].type != DS_TYPE_GAUGE) && (ds->ds[i].type != DS_TYPE_DERIVE) && (ds->ds[i].type != DS_TYPE_ABSOLUTE)) + { + sfree (rates); return (-1); + } - if (ds->ds[i].type == DS_TYPE_GAUGE) + if (ds->ds[i].type == DS_TYPE_GAUGE) { status = ssnprintf (buffer + offset, buffer_len - offset, ",%lf", vl->values[i].gauge); - } + } else if (store_rates != 0) { if (rates == NULL) @@ -185,7 +187,7 @@ static int value_list_to_filename (char *buffer, size_t buffer_size, static int csv_create_file (const char *filename, const data_set_t *ds) { FILE *csv; - int i; + size_t i; if (check_create_dir (filename)) return (-1);