diff --git a/src/olsrd.c b/src/olsrd.c
index 976793fe38fbc86856346df85050aa0f56be0104..3bf71280b46b51d4e1690472fac2feb1b4633d93 100644 (file)
--- a/src/olsrd.c
+++ b/src/olsrd.c
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
@@ -149,15 +150,13 @@ 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;
- ai_list = NULL;
-
struct addrinfo ai_hints = {
- .ai_family = PF_UNSPEC,
+ .ai_family = AF_UNSPEC,
.ai_flags = AI_ADDRCONFIG,
.ai_protocol = IPPROTO_TCP,
.ai_socktype = SOCK_STREAM
}
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;
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));