Merge branch 'collectd-5.7'

[collectd.git] / src / teamspeak2.c

diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index 5b583b8..a959cdd 100644 (file)
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
@@ -108,14 +108,10 @@ static void tss2_submit_gauge(const char *plugin_instance, const char *type,
   /*
    * Submits a gauge value to the collectd daemon
    */
-  value_t values[1];
   value_list_t vl = VALUE_LIST_INIT;
 
-  values[0].gauge = value;
-
-  vl.values = values;
+  vl.values = &(value_t){.gauge = value};
   vl.values_len = 1;
-  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
   sstrncpy(vl.plugin, "teamspeak2", sizeof(vl.plugin));
 
   if (plugin_instance != NULL)
@@ -134,15 +130,13 @@ static void tss2_submit_io(const char *plugin_instance, const char *type,
   /*
    * Submits the io rx/tx tuple to the collectd daemon
    */
-  value_t values[2];
   value_list_t vl = VALUE_LIST_INIT;
-
-  values[0].derive = rx;
-  values[1].derive = tx;
+  value_t values[] = {
+      {.derive = rx}, {.derive = tx},
+  };
 
   vl.values = values;
-  vl.values_len = 2;
-  sstrncpy(vl.host, hostname_g, sizeof(vl.host));
+  vl.values_len = STATIC_ARRAY_SIZE(values);
   sstrncpy(vl.plugin, "teamspeak2", sizeof(vl.plugin));
 
   if (plugin_instance != NULL)
@@ -734,5 +728,3 @@ void module_register(void) {
   plugin_register_read("teamspeak2", tss2_read);
   plugin_register_shutdown("teamspeak2", tss2_shutdown);
 } /* void module_register */
-
-/* vim: set sw=4 ts=4 : */