Merge branch 'collectd-5.6' into collectd-5.7

[collectd.git] / src / apache.c

diff --git a/src/apache.c b/src/apache.c
index 50784e5..29c36cc 100644 (file)
--- a/src/apache.c
+++ b/src/apache.c
@@ -217,19 +217,19 @@ static int config_add(oconfig_item_t *ci) {
   }
 
   if (status == 0) {
-    user_data_t ud = {.data = st, .free_func = apache_free};
-
     char callback_name[3 * DATA_MAX_NAME_LEN];
 
     ssnprintf(callback_name, sizeof(callback_name), "apache/%s/%s",
               (st->host != NULL) ? st->host : hostname_g,
               (st->name != NULL) ? st->name : "default");
 
-    status = plugin_register_complex_read(/* group = */ NULL,
-                                          /* name      = */ callback_name,
-                                          /* callback  = */ apache_read_host,
-                                          /* interval  = */ 0,
-                                          /* user_data = */ &ud);
+    status = plugin_register_complex_read(
+        /* group = */ NULL,
+        /* name      = */ callback_name,
+        /* callback  = */ apache_read_host,
+        /* interval  = */ 0, &(user_data_t){
+                                 .data = st, .free_func = apache_free,
+                             });
   }
 
   if (status != 0) {
@@ -356,8 +356,8 @@ static void submit_value(const char *type, const char *type_instance,
   vl.values = &value;
   vl.values_len = 1;
 
-  sstrncpy(vl.host, (st->host != NULL) ? st->host : hostname_g,
-           sizeof(vl.host));
+  if (st->host != NULL)
+    sstrncpy(vl.host, st->host, sizeof(vl.host));
 
   sstrncpy(vl.plugin, "apache", sizeof(vl.plugin));
   if (st->name != NULL)
@@ -371,17 +371,13 @@ static void submit_value(const char *type, const char *type_instance,
 } /* void submit_value */
 
 static void submit_derive(const char *type, const char *type_instance,
-                          derive_t c, apache_t *st) {
-  value_t v;
-  v.derive = c;
-  submit_value(type, type_instance, v, st);
+                          derive_t d, apache_t *st) {
+  submit_value(type, type_instance, (value_t){.derive = d}, st);
 } /* void submit_derive */
 
 static void submit_gauge(const char *type, const char *type_instance, gauge_t g,
                          apache_t *st) {
-  value_t v;
-  v.gauge = g;
-  submit_value(type, type_instance, v, st);
+  submit_value(type, type_instance, (value_t){.gauge = g}, st);
 } /* void submit_gauge */
 
 static void submit_scoreboard(char *buf, apache_t *st) {