X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcsv.c;h=7b513e7345199a508fc53531187aac959784c74b;hb=75323bd2ca5e0fdb8d93b34e7d9b8effac972697;hp=958e34baf0d96d825e8ce9dfa79a21849db6e3d2;hpb=443afcad2cbacaca9bb1fd7d9ea790cbeb6ff015;p=collectd.git

diff --git a/src/csv.c b/src/csv.c
index 958e34ba..7b513e73 100644
--- a/src/csv.c
+++ b/src/csv.c
@@ -17,7 +17,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  *
  * Authors:
- *   Florian octo Forster <octo at verplant.org>
+ *   Florian octo Forster <octo at collectd.org>
  *   Doug MacEachern <dougm@hyperic.com>
  **/
 
@@ -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);