X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fhddtemp.c;h=865ea8614afda35cee5993eeec8cf61e86c6f8b6;hb=7dcf9ab7675fe91d1bd74998f55031bc3b0480c0;hp=3de18fd91354d166a58beff919d4b38e65e0fe33;hpb=0d80072344ea5322c34f716ed77a5319a62bfc96;p=collectd.git

diff --git a/src/hddtemp.c b/src/hddtemp.c
index 3de18fd9..865ea861 100644
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -30,9 +30,9 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
-#include "configfile.h"
 
 # include <netdb.h>
 # include <netinet/in.h>
@@ -88,19 +88,9 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 	const char *host;
 	const char *port;
 
-	struct addrinfo  ai_hints;
-	struct addrinfo *ai_list, *ai_ptr;
+	struct addrinfo *ai_list;
 	int              ai_return;
 
-	memset (&ai_hints, '\0', sizeof (ai_hints));
-	ai_hints.ai_flags    = 0;
-#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 = hddtemp_host;
 	if (host == NULL)
 		host = HDDTEMP_DEF_HOST;
@@ -109,6 +99,13 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 	if (strlen (port) == 0)
 		port = HDDTEMP_DEF_PORT;
 
+	struct addrinfo ai_hints = {
+		.ai_flags = AI_ADDRCONFIG,
+		.ai_family = AF_UNSPEC,
+		.ai_protocol = IPPROTO_TCP,
+		.ai_socktype = SOCK_STREAM
+	};
+
 	if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0)
 	{
 		char errbuf[1024];
@@ -121,7 +118,7 @@ static int hddtemp_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 */
 		fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype,
@@ -252,7 +249,6 @@ static int hddtemp_read (void)
 	char *saveptr;
 	int num_fields;
 	int num_disks;
-	int i;
 
 	/* get data from daemon */
 	if (hddtemp_query_daemon (buf, sizeof (buf)) < 0)
@@ -273,7 +269,7 @@ static int hddtemp_read (void)
 
 	num_disks = num_fields / 4;
 
-	for (i = 0; i < num_disks; i++)
+	for (int i = 0; i < num_disks; i++)
 	{
 		char *name;
 		double temperature;