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

diff --git a/src/mbmon.c b/src/mbmon.c
index 5f398d0c..9629b896 100644
--- a/src/mbmon.c
+++ b/src/mbmon.c
@@ -24,9 +24,9 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #include <netdb.h>
 #include <netinet/in.h>
@@ -84,7 +84,7 @@ static int mbmon_query_daemon (char *buffer, int buffer_size)
 	const char *host;
 	const char *port;
 
-	struct addrinfo *ai_list, *ai_ptr;
+	struct addrinfo *ai_list;
 	int              ai_return;
 
 	host = mbmon_host;
@@ -114,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)
@@ -236,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';
 }