X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_cmd_putval.c;h=826e1b0390fb53dbb7944a96bc5a29616edfded7;hb=f71895576cbd4b488cd66f0c96efb6fd3e7a6faf;hp=5bd6ec738fd2e188b4b253e3e7ce51937383690a;hpb=56159e13f4b983a2e8c846b39ca96b2384ec746a;p=collectd.git

diff --git a/src/utils_cmd_putval.c b/src/utils_cmd_putval.c
index 5bd6ec73..826e1b03 100644
--- a/src/utils_cmd_putval.c
+++ b/src/utils_cmd_putval.c
@@ -1,6 +1,6 @@
 /**
  * collectd - src/utils_cms_putval.c
- * Copyright (C) 2007,2008  Florian octo Forster
+ * Copyright (C) 2007-2009  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -33,7 +33,7 @@
 		return -1; \
 	}
 
-static int parse_value (const data_set_t *ds, value_list_t *vl,
+static int dispatch_values (const data_set_t *ds, value_list_t *vl,
 	       	FILE *fh, char *buffer)
 {
 	char *dummy;
@@ -65,12 +65,13 @@ static int parse_value (const data_set_t *ds, value_list_t *vl,
 			break;
 		}
 
-		if (strcmp (ptr, "U") == 0)
+		if ((strcmp (ptr, "U") == 0) && (ds->ds[i].type == DS_TYPE_GAUGE))
 			vl->values[i].gauge = NAN;
-		else if (ds->ds[i].type == DS_TYPE_COUNTER)
-			vl->values[i].counter = atoll (ptr);
-		else if (ds->ds[i].type == DS_TYPE_GAUGE)
-			vl->values[i].gauge = atof (ptr);
+		else if (0 != parse_value (ptr, &vl->values[i], ds->ds[i]))
+		{
+			print_to_socket (fh, "-1 Failed to parse value `%s'.\n", ptr);
+			return (-1);
+		}
 
 		i++;
 	} /* while (strtok_r) */
@@ -79,7 +80,7 @@ static int parse_value (const data_set_t *ds, value_list_t *vl,
 	{
 		char identifier[128];
 		FORMAT_VL (identifier, sizeof (identifier), vl, ds);
-		ERROR ("cmd putval: parse_value: "
+		ERROR ("cmd putval: dispatch_values: "
 				"Number of values incorrect: "
 				"Got %i, expected %i. Identifier is `%s'.",
 				i, vl->values_len, identifier);
@@ -91,7 +92,7 @@ static int parse_value (const data_set_t *ds, value_list_t *vl,
 
 	plugin_dispatch_values (vl);
 	return (0);
-} /* int parse_value */
+} /* int dispatch_values */
 
 static int set_option (value_list_t *vl, const char *key, const char *value)
 {
@@ -252,7 +253,7 @@ int handle_putval (FILE *fh, char *buffer)
 		}
 		assert (string != NULL);
 
-		status = parse_value (ds, &vl, fh, string);
+		status = dispatch_values (ds, &vl, fh, string);
 		if (status != 0)
 		{
 			/* An error has already been printed. */