X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdns.c;h=04e5a1e6459671d04aab853256616514a3ad5a32;hb=ec43e8a33bdcb116e75310c7bd9daae3bc912834;hp=a2a4667a119587f2e56b48e894b58d48d7296f96;hpb=f0d468892e1c173b226f739be48291981473b4fb;p=collectd.git diff --git a/src/dns.c b/src/dns.c index a2a4667a..04e5a1e6 100644 --- a/src/dns.c +++ b/src/dns.c @@ -28,7 +28,6 @@ #include "common.h" #include "plugin.h" -#include "configfile.h" #include "utils_dns.h" #include @@ -371,14 +370,10 @@ static int dns_init (void) static void submit_derive (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, "dns", sizeof (vl.plugin)); sstrncpy (vl.type, type, sizeof (vl.type)); sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); @@ -388,15 +383,14 @@ static void submit_derive (const char *type, const char *type_instance, static void submit_octets (derive_t queries, derive_t responses) { - value_t values[2]; + value_t values[] = { + { .derive = queries }, + { .derive = responses }, + }; value_list_t vl = VALUE_LIST_INIT; - values[0].derive = queries; - values[1].derive = responses; - 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, "dns", sizeof (vl.plugin)); sstrncpy (vl.type, "dns_octets", sizeof (vl.type));