X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fvarnish.c;h=e1464dc40cccf155bb2e38514d779feed7dc522e;hb=bf70b5ba18d3fc58f976f2923ecf7135900537a7;hp=91320fed8a8ecab93a64ab5fe0620111deea598b;hpb=5cd5988ec752f441254fc887117c3d5aa8f8d094;p=collectd.git

diff --git a/src/varnish.c b/src/varnish.c
index 91320fed..e1464dc4 100644
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -94,13 +94,10 @@ static int varnish_submit (const char *plugin_instance, /* {{{ */
 	vl.values = &value;
 	vl.values_len = 1;
 
-	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
-
 	sstrncpy (vl.plugin, "varnish", sizeof (vl.plugin));
 
 	if (plugin_instance == NULL)
 		plugin_instance = "default";
-
 	ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
 		"%s-%s", plugin_instance, category);
 
@@ -117,22 +114,16 @@ static int varnish_submit_gauge (const char *plugin_instance, /* {{{ */
 		const char *category, const char *type, const char *type_instance,
 		uint64_t gauge_value)
 {
-	value_t value;
-
-	value.gauge = (gauge_t) gauge_value;
-
-	return (varnish_submit (plugin_instance, category, type, type_instance, value));
+	return (varnish_submit (plugin_instance, category, type, type_instance,
+				(value_t) { .gauge = (gauge_t) gauge_value }));
 } /* }}} int varnish_submit_gauge */
 
 static int varnish_submit_derive (const char *plugin_instance, /* {{{ */
 		const char *category, const char *type, const char *type_instance,
 		uint64_t derive_value)
 {
-	value_t value;
-
-	value.derive = (derive_t) derive_value;
-
-	return (varnish_submit (plugin_instance, category, type, type_instance, value));
+	return (varnish_submit (plugin_instance, category, type, type_instance,
+				(value_t) { .derive = (derive_t) derive_value }));
 } /* }}} int varnish_submit_derive */
 
 #if HAVE_VARNISH_V3 || HAVE_VARNISH_V4
@@ -955,7 +946,7 @@ static int varnish_init (void) /* {{{ */
 			/* name      = */ "varnish/localhost",
 			/* callback  = */ varnish_read,
 			/* interval  = */ 0,
-			/* user data = */ &(user_data_t) {
+			&(user_data_t) {
 				.data = conf,
 				.free_func = varnish_config_free,
 			});
@@ -1133,9 +1124,9 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
 			/* name      = */ callback_name,
 			/* callback  = */ varnish_read,
 			/* interval  = */ 0,
-			/* user data = */ &(user_data_t) {
-				ud.data = conf,
-				ud.free_func = varnish_config_free,
+			&(user_data_t) {
+				.data = conf,
+				.free_func = varnish_config_free,
 			});
 
 	have_instance = 1;