Merge branch 'collectd-5.6' into collectd-5.7

[collectd.git] / src / ipvs.c

diff --git a/src/ipvs.c b/src/ipvs.c
index 3b96332..2446bd1 100644 (file)
--- a/src/ipvs.c
+++ b/src/ipvs.c
@@ -220,15 +220,11 @@ static int get_ti(struct ip_vs_dest_entry *de, char *ti, size_t size) {
 
 static void cipvs_submit_connections(const char *pi, const char *ti,
                                      derive_t value) {
-  value_t values[1];
   value_list_t vl = VALUE_LIST_INIT;
 
-  values[0].derive = value;
-
-  vl.values = values;
+  vl.values = &(value_t){.derive = value};
   vl.values_len = 1;
 
-  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
   sstrncpy(vl.plugin, "ipvs", sizeof(vl.plugin));
   sstrncpy(vl.plugin_instance, pi, sizeof(vl.plugin_instance));
   sstrncpy(vl.type, "connections", sizeof(vl.type));
@@ -241,16 +237,14 @@ static void cipvs_submit_connections(const char *pi, const char *ti,
 
 static void cipvs_submit_if(const char *pi, const char *t, const char *ti,
                             derive_t rx, derive_t tx) {
-  value_t values[2];
+  value_t values[] = {
+      {.derive = rx}, {.derive = tx},
+  };
   value_list_t vl = VALUE_LIST_INIT;
 
-  values[0].derive = rx;
-  values[1].derive = tx;
-
   vl.values = values;
-  vl.values_len = 2;
+  vl.values_len = STATIC_ARRAY_SIZE(values);
 
-  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
   sstrncpy(vl.plugin, "ipvs", sizeof(vl.plugin));
   sstrncpy(vl.plugin_instance, pi, sizeof(vl.plugin_instance));
   sstrncpy(vl.type, t, sizeof(vl.type));