X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fntpd.c;h=30f29c97dbfcef7f50afbb8daa1a5d2b67f305e8;hb=7dcf9ab7675fe91d1bd74998f55031bc3b0480c0;hp=02c9f6dc9566cc7e11d0fe1302849a76013ec894;hpb=4103105fb43cd72294f165b2541540b3a8a99532;p=collectd.git

diff --git a/src/ntpd.c b/src/ntpd.c
index 02c9f6dc..30f29c97 100644
--- a/src/ntpd.c
+++ b/src/ntpd.c
@@ -31,7 +31,6 @@
 
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 #if HAVE_STDINT_H
 # include <stdint.h>
@@ -348,7 +347,6 @@ static int ntpd_connect (void)
 	const char *port;
 
 	struct addrinfo *ai_list;
-	struct addrinfo *ai_ptr;
 	int              status;
 
 	if (sock_descr >= 0)
@@ -382,7 +380,7 @@ static int ntpd_connect (void)
 		return (-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 ((sock_descr = socket (ai_ptr->ai_family,
@@ -420,7 +418,6 @@ static int ntpd_receive_response (int *res_items, int *res_size,
 	struct resp_pkt  res;
 	int              status;
 	int              done;
-	int              i;
 
 	char            *items;
 	size_t           items_num;
@@ -674,7 +671,7 @@ static int ntpd_receive_response (int *res_items, int *res_size,
 		items_num += pkt_item_num;
 		*res_data = items;
 
-		for (i = 0; i < pkt_item_num; i++)
+		for (int i = 0; i < pkt_item_num; i++)
 		{
 			/* dst: There are already `*res_items' items with
 			 *      res_item_size bytes each in in `*res_data'. Set
@@ -903,7 +900,6 @@ static int ntpd_read (void)
 	gauge_t offset_error;
 
 	int status;
-	int i;
 
 	/* On Linux, if the STA_NANO bit is set in ik->status, then ik->offset
 	 * is is nanoseconds, otherwise it's microseconds. */
@@ -971,7 +967,7 @@ static int ntpd_read (void)
 		return (-1);
 	}
 
-	for (i = 0; i < ps_num; i++)
+	for (int i = 0; i < ps_num; i++)
 	{
 		struct info_peer_summary *ptr;
 		double offset;