X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetlink.c;h=786056d49341623eff23359af52ba8fb7485eb2a;hb=50ad45a6a6c68119823d56c1ccec74135ba744f9;hp=cfca46f7494084de4939288f72a95632c2fcdd44;hpb=f876292e5ce4be40ab5b031b2bcfb347f00da1f8;p=collectd.git diff --git a/src/netlink.c b/src/netlink.c index cfca46f7..786056d4 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -194,12 +194,9 @@ static int check_ignorelist (const char *dev, static void submit_one (const char *dev, const char *type, const char *type_instance, 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, "netlink", sizeof (vl.plugin)); @@ -216,14 +213,14 @@ static void submit_two (const char *dev, const char *type, 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 = 2; + vl.values_len = STATIC_ARRAY_SIZE (values); sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "netlink", sizeof (vl.plugin)); sstrncpy (vl.plugin_instance, dev, sizeof (vl.plugin_instance));