collectd.spec: add missing %define required by gps plugin

[collectd.git] / src / hddtemp.c

diff --git a/src/hddtemp.c b/src/hddtemp.c
index 1b7ed32..8213e97 100644 (file)
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -30,6 +30,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 #include "configfile.h"
@@ -88,7 +89,7 @@ static int hddtemp_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 = hddtemp_host;
@@ -101,7 +102,7 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 
        struct addrinfo ai_hints = {
                .ai_flags = AI_ADDRCONFIG,
-               .ai_family = PF_UNSPEC,
+               .ai_family = AF_UNSPEC,
                .ai_protocol = IPPROTO_TCP,
                .ai_socktype = SOCK_STREAM
        };
@@ -118,7 +119,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,
@@ -249,7 +250,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)
@@ -270,7 +270,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;