X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvserver.c;h=f3a2b5a4eeadb8dea5aaaa0ca5bdcb45db41a99b;hb=7535ee83bf0b12a168cee3c70e5fb97ed6dfc96c;hp=1d957eb3164d191183f77caff4677247eef72b27;hpb=21058a13ed34ade6d2de0f54e4216b255d033af1;p=collectd.git diff --git a/src/vserver.c b/src/vserver.c index 1d957eb3..f3a2b5a4 100644 --- a/src/vserver.c +++ b/src/vserver.c @@ -27,6 +27,7 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" @@ -55,11 +56,11 @@ static int vserver_init (void) static void traffic_submit (const char *plugin_instance, const char *type_instance, derive_t rx, derive_t tx) { - 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 = STATIC_ARRAY_SIZE (values); @@ -75,12 +76,12 @@ static void traffic_submit (const char *plugin_instance, static void load_submit (const char *plugin_instance, gauge_t snum, gauge_t mnum, gauge_t lnum) { - value_t values[3]; value_list_t vl = VALUE_LIST_INIT; - - values[0].gauge = snum; - values[1].gauge = mnum; - values[2].gauge = lnum; + value_t values[] = { + { .gauge = snum }, + { .gauge = mnum }, + { .gauge = lnum }, + }; vl.values = values; vl.values_len = STATIC_ARRAY_SIZE (values); @@ -96,13 +97,10 @@ static void submit_gauge (const char *plugin_instance, const char *type, const char *type_instance, gauge_t value) { - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].gauge = value; - - vl.values = values; - vl.values_len = STATIC_ARRAY_SIZE (values); + vl.values = &(value_t) { .gauge = value }; + vl.values_len = 1; sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "vserver", sizeof (vl.plugin)); sstrncpy (vl.plugin_instance, plugin_instance, sizeof (vl.plugin_instance));