X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmbmon.c;h=9629b8960d67da5960f957d89f48bfd0c40f500c;hb=89be8ccf23c003d22d112de0fe5417d747fa20a4;hp=d16845e3fb4ff070c5f8a7766c44a2737e846218;hpb=a5377cf935630082f2eac2e5f4a538844cc06c8d;p=collectd.git

diff --git a/src/mbmon.c b/src/mbmon.c
index d16845e3..9629b896 100644
--- a/src/mbmon.c
+++ b/src/mbmon.c
@@ -27,7 +27,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <netdb.h>
 #include <netinet/in.h>
@@ -85,17 +84,9 @@ static int mbmon_query_daemon (char *buffer, int buffer_size)
 	const char *host;
 	const char *port;
 
-	struct addrinfo  ai_hints = { 0 };
-	struct addrinfo *ai_list, *ai_ptr;
+	struct addrinfo *ai_list;
 	int              ai_return;
 
-#ifdef AI_ADDRCONFIG
-	ai_hints.ai_flags   |= AI_ADDRCONFIG;
-#endif
-	ai_hints.ai_family   = PF_UNSPEC;
-	ai_hints.ai_socktype = SOCK_STREAM;
-	ai_hints.ai_protocol = IPPROTO_TCP;
-
 	host = mbmon_host;
 	if (host == NULL)
 		host = MBMON_DEF_HOST;
@@ -104,6 +95,13 @@ static int mbmon_query_daemon (char *buffer, int buffer_size)
 	if (port == NULL)
 		port = MBMON_DEF_PORT;
 
+	struct addrinfo ai_hints = {
+		.ai_family = AF_UNSPEC,
+		.ai_flags = AI_ADDRCONFIG,
+		.ai_protocol = IPPROTO_TCP,
+		.ai_socktype = SOCK_STREAM
+	};
+
 	if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0)
 	{
 		char errbuf[1024];
@@ -116,7 +114,7 @@ static int mbmon_query_daemon (char *buffer, int buffer_size)
 	}
 
 	fd = -1;
-	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)
 	{
 		/* create our socket descriptor */
 		if ((fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol)) < 0)
@@ -238,9 +236,7 @@ static void mbmon_submit (const char *type, const char *type_instance,
 /* Trim trailing whitespace from a string. */
 static void trim_spaces (char *s)
 {
-	size_t l;
-
-	for (l = strlen (s) - 1; (l > 0) && isspace ((int) s[l]); l--)
+	for (size_t l = strlen (s) - 1; (l > 0) && isspace ((int) s[l]); l--)
 		s[l] = '\0';
 }