X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Folsrd.c;h=3a36723d6770b212691c696810620f88332957c5;hb=ec43e8a33bdcb116e75310c7bd9daae3bc912834;hp=976793fe38fbc86856346df85050aa0f56be0104;hpb=aa3811995bfae69f0d1a0f897acfa4a9a4c0138a;p=collectd.git

diff --git a/src/olsrd.c b/src/olsrd.c
index 976793fe..3a36723d 100644
--- a/src/olsrd.c
+++ b/src/olsrd.c
@@ -25,6 +25,7 @@
  **/
 
 #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
@@ -174,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;
@@ -217,15 +216,11 @@ __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));
   sstrncpy (vl.plugin, "olsrd", sizeof (vl.plugin));
   if (plugin_instance != NULL)
     sstrncpy (vl.plugin_instance, plugin_instance,