X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetlink.c;h=8076c1fa4436b21fd52533ea379c2f09ea74b8a4;hb=e37e426d6646d6ff99834461f00c3dd79fa85d43;hp=0a3320732b298301eacefc729429f35dbab3ded5;hpb=79963d13c1884d1d92667cc502ad20758b084a12;p=collectd.git diff --git a/src/netlink.c b/src/netlink.c index 0a332073..8076c1fa 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -174,14 +174,10 @@ static int check_ignorelist(const char *dev, const char *type, 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)); sstrncpy(vl.plugin_instance, dev, sizeof(vl.plugin_instance)); sstrncpy(vl.type, type, sizeof(vl.type)); @@ -194,15 +190,13 @@ static void submit_one(const char *dev, const char *type, 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; - sstrncpy(vl.host, hostname_g, sizeof(vl.host)); + vl.values_len = STATIC_ARRAY_SIZE(values); sstrncpy(vl.plugin, "netlink", sizeof(vl.plugin)); sstrncpy(vl.plugin_instance, dev, sizeof(vl.plugin_instance)); sstrncpy(vl.type, type, sizeof(vl.type));