X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Folsrd.c;h=3bf71280b46b51d4e1690472fac2feb1b4633d93;hb=7535ee83bf0b12a168cee3c70e5fb97ed6dfc96c;hp=7838ebaaa2f90ed96164a19dfba6c37e4bc09591;hpb=71bbf854d3e6f8c6d6c3582527263bb01a3a7e04;p=collectd.git diff --git a/src/olsrd.c b/src/olsrd.c index 7838ebaa..3bf71280 100644 --- a/src/olsrd.c +++ b/src/olsrd.c @@ -25,6 +25,7 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" @@ -149,7 +150,7 @@ static size_t strtabsplit (char *string, char **fields, size_t size) /* {{{ */ static FILE *olsrd_connect (void) /* {{{ */ { - struct addrinfo *ai_list, *ai_ptr; + struct addrinfo *ai_list; int ai_return; FILE *fh; @@ -172,7 +173,7 @@ static FILE *olsrd_connect (void) /* {{{ */ } fh = NULL; - for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) + for (struct addrinfo *ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) { int fd; int status; @@ -215,12 +216,9 @@ __attribute__ ((nonnull(2))) static void olsrd_submit (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 = &(value_t) { .gauge = value }; vl.values_len = 1; sstrncpy (vl.host, hostname_g, sizeof (vl.host));