From: Rinigus <rinigus.git@gmail.com>
Date: Sun, 18 Sep 2016 18:11:04 +0000 (+0300)
Subject: parse_value_file: adding strstripnewline back
X-Git-Tag: collectd-5.7.0~74^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=a39ddf983654047f745c2672999df0ac13adb705;p=collectd.git

parse_value_file: adding strstripnewline back
---

diff --git a/src/daemon/common.c b/src/daemon/common.c
index d2fae571..654a5a09 100644
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
@@ -1091,11 +1091,6 @@ int parse_identifier_vl (const char *str, value_list_t *vl) /* {{{ */
 
 int parse_value (const char *value_orig, value_t *ret_value, int ds_type)
 {
-  return parse_value_ext(value_orig, ret_value, ds_type, "");
-}
-
-int parse_value_ext (const char *value_orig, value_t *ret_value, int ds_type, const char *error_identifier)
-{
   char *value;
   char *endptr = NULL;
   size_t value_len;
@@ -1134,19 +1129,19 @@ int parse_value_ext (const char *value_orig, value_t *ret_value, int ds_type, co
 
     default:
       sfree (value);
-      ERROR ("parse_value %s: Invalid data source type: %i.", error_identifier, ds_type);
+      ERROR ("parse_value: Invalid data source type: %i.", ds_type);
       return -1;
   }
 
   if (value == endptr) {
-    ERROR ("parse_value %s: Failed to parse string as %s: %s.", error_identifier,
+    ERROR ("parse_value: Failed to parse string as %s: %s.",
         DS_TYPE_TO_STRING (ds_type), value);
     sfree (value);
     return -1;
   }
   else if ((NULL != endptr) && ('\0' != *endptr))
-    INFO ("parse_value %s: Ignoring trailing garbage \"%s\" after %s value. "
-        "Input string was \"%s\".", error_identifier,
+    INFO ("parse_value: Ignoring trailing garbage \"%s\" after %s value. "
+        "Input string was \"%s\".",
         endptr, DS_TYPE_TO_STRING (ds_type), value_orig);
 
   sfree (value);
@@ -1231,7 +1226,9 @@ int parse_value_file (char const *path, value_t *ret_value, int ds_type)
 
 	fclose (fh);
 
-	return parse_value_ext (buffer, ret_value, ds_type, path);
+	strstripnewline (buffer);
+
+	return parse_value (buffer, ret_value, ds_type);
 } /* int parse_value_file */
 
 #if !HAVE_GETPWNAM_R
diff --git a/src/daemon/common.h b/src/daemon/common.h
index 87dd4a04..6d01ca4b 100644
--- a/src/daemon/common.h
+++ b/src/daemon/common.h
@@ -323,7 +323,6 @@ int parse_identifier (char *str, char **ret_host,
 		char **ret_type, char **ret_type_instance);
 int parse_identifier_vl (const char *str, value_list_t *vl);
 int parse_value (const char *value, value_t *ret_value, int ds_type);
-int parse_value_ext (const char *value, value_t *ret_value, int ds_type, const char *error_identifier);
 int parse_values (char *buffer, value_list_t *vl, const data_set_t *ds);
 
 /* parse_value_file reads "path" and parses its content as an integer or