X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_curl_stats.c;h=0509ff43beaf58e8c646689b2992fddff628ece0;hb=0a95b83f89a553be1ac2beae2003927e74230d23;hp=5a37083a0aa6e680c26852b4cd6e1307386315f1;hpb=5007fb256b4abbef2dbc675f9a15273554a3385e;p=collectd.git

diff --git a/src/utils_curl_stats.c b/src/utils_curl_stats.c
index 5a37083a..0509ff43 100644
--- a/src/utils_curl_stats.c
+++ b/src/utils_curl_stats.c
@@ -25,6 +25,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "utils_curl_stats.h"
 
@@ -136,7 +137,9 @@ static struct {
 	SPEC (redirect_time,           "RedirectTime",           dispatch_gauge, "duration", CURLINFO_REDIRECT_TIME),
 	SPEC (redirect_count,          "RedirectCount",          dispatch_size,  "count",    CURLINFO_REDIRECT_COUNT),
 	SPEC (num_connects,            "NumConnects",            dispatch_size,  "count",    CURLINFO_NUM_CONNECTS),
+#ifdef HAVE_CURLINFO_APPCONNECT_TIME
 	SPEC (appconnect_time,         "AppconnectTime",         dispatch_gauge, "duration", CURLINFO_APPCONNECT_TIME),
+#endif
 
 #undef SPEC
 };
@@ -157,20 +160,21 @@ static bool field_enabled (curl_stats_t *s, size_t offset)
 curl_stats_t *curl_stats_from_config (oconfig_item_t *ci)
 {
 	curl_stats_t *s;
-	int i;
 
 	if (ci == NULL)
 		return NULL;
 
-	s = calloc (sizeof (*s), 1);
+	s = calloc (1, sizeof (*s));
 	if (s == NULL)
 		return NULL;
 
-	for (i = 0; i < ci->children_num; ++i)
+	for (int i = 0; i < ci->children_num; ++i)
 	{
 		oconfig_item_t *c = ci->children + i;
 		size_t field;
 
+		_Bool enabled = 0;
+
 		for (field = 0; field < STATIC_ARRAY_SIZE (field_specs); ++field) {
 			if (! strcasecmp (c->key, field_specs[field].config_key))
 				break;
@@ -184,18 +188,12 @@ curl_stats_t *curl_stats_from_config (oconfig_item_t *ci)
 			return NULL;
 		}
 
-		if ((c->values_num != 1)
-				|| ((c->values[0].type != OCONFIG_TYPE_STRING)
-					&& (c->values[0].type != OCONFIG_TYPE_BOOLEAN))) {
-			ERROR ("curl stats: `%s' expects a single boolean argument", c->key);
+
+		if (cf_util_get_boolean (c, &enabled) != 0) {
 			free (s);
 			return NULL;
 		}
-
-		if (((c->values[0].type == OCONFIG_TYPE_STRING)
-					&& IS_TRUE (c->values[0].value.string))
-				|| ((c->values[0].type == OCONFIG_TYPE_BOOLEAN)
-					&& c->values[0].value.boolean))
+		if (enabled)
 			enable_field (s, field_specs[field].offset);
 	}
 
@@ -209,25 +207,27 @@ void curl_stats_destroy (curl_stats_t *s)
 } /* curl_stats_destroy */
 
 int curl_stats_dispatch (curl_stats_t *s, CURL *curl,
-		const char *hostname, const char *plugin, const char *plugin_instance,
-		const char *instance_prefix)
+		const char *hostname, const char *plugin, const char *plugin_instance)
 {
 	value_list_t vl = VALUE_LIST_INIT;
-	size_t field;
 
 	if (s == NULL)
 		return 0;
-	if (curl == NULL)
+	if ((curl == NULL) || (hostname == NULL) || (plugin == NULL))
+	{
+		ERROR ("curl stats: dispatch() called with missing arguments "
+				"(curl=%p; hostname=%s; plugin=%s)", curl,
+				hostname == NULL ? "<NULL>" : hostname,
+				plugin == NULL ? "<NULL>" : plugin);
 		return -1;
+	}
 
-	if (hostname != NULL)
-		sstrncpy (vl.host, hostname, sizeof (vl.host));
-	if (plugin != NULL)
-		sstrncpy (vl.plugin, plugin, sizeof (vl.plugin));
+	sstrncpy (vl.host, hostname, sizeof (vl.host));
+	sstrncpy (vl.plugin, plugin, sizeof (vl.plugin));
 	if (plugin_instance != NULL)
 		sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));
 
-	for (field = 0; field < STATIC_ARRAY_SIZE (field_specs); ++field)
+	for (size_t field = 0; field < STATIC_ARRAY_SIZE (field_specs); ++field)
 	{
 		int status;
 
@@ -235,8 +235,7 @@ int curl_stats_dispatch (curl_stats_t *s, CURL *curl,
 			continue;
 
 		sstrncpy (vl.type, field_specs[field].type, sizeof (vl.type));
-		ssnprintf (vl.type_instance, sizeof (vl.type_instance), "%s%s",
-				instance_prefix ? instance_prefix : "", field_specs[field].name);
+		sstrncpy (vl.type_instance, field_specs[field].name, sizeof (vl.type_instance));
 
 		vl.values = NULL;
 		vl.values_len = 0;