X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fopenvpn.c;h=81ffa89988f218edf6ef9b6538b90d43614f1808;hb=50ad45a6a6c68119823d56c1ccec74135ba744f9;hp=00ae736ad4b01c70555f509c0b3580afb8fa8329;hpb=1bdfcf9791729310f75857d0e002c40ef659a89b;p=collectd.git diff --git a/src/openvpn.c b/src/openvpn.c index 00ae736a..81ffa899 100644 --- a/src/openvpn.c +++ b/src/openvpn.c @@ -99,13 +99,10 @@ static int openvpn_strsplit (char *string, char **fields, size_t size) static void numusers_submit (const char *pinst, const char *tinst, 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, "openvpn", sizeof (vl.plugin)); sstrncpy (vl.type, "users", sizeof (vl.type)); @@ -122,11 +119,11 @@ static void numusers_submit (const char *pinst, const char *tinst, static void iostats_submit (const char *pinst, const char *tinst, 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 }, + }; /* NOTE ON THE NEW NAMING SCHEMA: * using plugin_instance to identify each vpn config (and @@ -152,11 +149,11 @@ static void iostats_submit (const char *pinst, const char *tinst, static void compression_submit (const char *pinst, const char *tinst, derive_t uncompressed, derive_t compressed) { - value_t values[2]; value_list_t vl = VALUE_LIST_INIT; - - values[0].derive = uncompressed; - values[1].derive = compressed; + value_t values[] = { + { .derive = uncompressed }, + { .derive = compressed }, + }; vl.values = values; vl.values_len = STATIC_ARRAY_SIZE (values);