X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fvarnish.c;h=c2149126bea18963ad9964119ba21ee6b937477f;hb=afb38f31abd27d5b4ce08023f8bbbaeeb353c55f;hp=e65b2a37223ffea64a8ded1d33f6fab22361afb7;hpb=6743e8a4e1bd0b627fee3a3e51226c07c3facbcb;p=collectd.git

diff --git a/src/varnish.c b/src/varnish.c
index e65b2a37..c2149126 100644
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -938,7 +938,6 @@ static int varnish_config_apply_default (user_config_t *conf) /* {{{ */
 static int varnish_init (void) /* {{{ */
 {
 	user_config_t *conf;
-	user_data_t ud;
 
 	if (have_instance)
 		return (0);
@@ -952,14 +951,14 @@ static int varnish_init (void) /* {{{ */
 
 	varnish_config_apply_default (conf);
 
-	ud.data = conf;
-	ud.free_func = varnish_config_free;
-
 	plugin_register_complex_read (/* group = */ "varnish",
 			/* name      = */ "varnish/localhost",
 			/* callback  = */ varnish_read,
 			/* interval  = */ 0,
-			/* user data = */ &ud);
+			&(user_data_t) {
+				.data = conf,
+				.free_func = varnish_config_free,
+			});
 
 	return (0);
 } /* }}} int varnish_init */
@@ -967,7 +966,6 @@ static int varnish_init (void) /* {{{ */
 static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
 {
 	user_config_t *conf;
-	user_data_t ud;
 	char callback_name[DATA_MAX_NAME_LEN];
 
 	conf = calloc (1, sizeof (*conf));
@@ -1131,14 +1129,14 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
 	ssnprintf (callback_name, sizeof (callback_name), "varnish/%s",
 			(conf->instance == NULL) ? "localhost" : conf->instance);
 
-	ud.data = conf;
-	ud.free_func = varnish_config_free;
-
 	plugin_register_complex_read (/* group = */ "varnish",
 			/* name      = */ callback_name,
 			/* callback  = */ varnish_read,
 			/* interval  = */ 0,
-			/* user data = */ &ud);
+			&(user_data_t) {
+				.data = conf,
+				.free_func = varnish_config_free,
+			});
 
 	have_instance = 1;