Merge branch 'collectd-4.10' into collectd-5.0

[collectd.git] / src / common.c

diff --git a/src/common.c b/src/common.c
index 6fdb441..e1f204b 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -939,15 +939,15 @@ int parse_identifier_vl (const char *str, value_list_t *vl) /* {{{ */
        if (status != 0)
                return (status);
 
-       sstrncpy (vl->host, host, sizeof (host));
-       sstrncpy (vl->plugin, plugin, sizeof (plugin));
+       sstrncpy (vl->host, host, sizeof (vl->host));
+       sstrncpy (vl->plugin, plugin, sizeof (vl->plugin));
        sstrncpy (vl->plugin_instance,
                        (plugin_instance != NULL) ? plugin_instance : "",
-                       sizeof (plugin_instance));
-       sstrncpy (vl->type, type, sizeof (type));
+                       sizeof (vl->plugin_instance));
+       sstrncpy (vl->type, type, sizeof (vl->type));
        sstrncpy (vl->type_instance,
                        (type_instance != NULL) ? type_instance : "",
-                       sizeof (type_instance));
+                       sizeof (vl->type_instance));
 
        return (0);
 } /* }}} int parse_identifier_vl */
@@ -980,12 +980,15 @@ int parse_value (const char *value, value_t *ret_value, int ds_type)
   }
 
   if (value == endptr) {
-    ERROR ("parse_value: Failed to parse string as number: %s.", value);
+    ERROR ("parse_value: Failed to parse string as %s: %s.",
+        DS_TYPE_TO_STRING (ds_type), value);
     return -1;
   }
   else if ((NULL != endptr) && ('\0' != *endptr))
-    WARNING ("parse_value: Ignoring trailing garbage after number: %s.",
-        endptr);
+    INFO ("parse_value: Ignoring trailing garbage \"%s\" after %s value. "
+        "Input string was \"%s\".",
+        endptr, DS_TYPE_TO_STRING (ds_type), value);
+
   return 0;
 } /* int parse_value */