src/collectd.h: Don't mess with the syslog-stuff if it's present.

[collectd.git] / src / hddtemp.c

diff --git a/src/hddtemp.c b/src/hddtemp.c
index a89765a73447443c2124804aac2d0373eb48a083..80b3419bee76d3e96efacb242bdba4f946efc5be 100644 (file)
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -158,6 +158,10 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
                        fd = -1;
                        continue;
                }
+
+               /* A socket could be opened and connecting succeeded. We're
+                * done. */
+               break;
        }
 
        freeaddrinfo (ai_list);
@@ -181,6 +185,7 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size)
 
                        syslog (LOG_ERR, "hddtemp: Error reading from socket: %s",
                                                strerror (errno));
+                       close (fd);
                        return (-1);
                }
                buffer_fill += status;
@@ -346,7 +351,8 @@ static void hddtemp_init (void)
 
                        if ((entry = (hddname_t *) malloc (sizeof (hddname_t))) == NULL)
                        {
-                               syslog (LOG_ERR, "hddtemp: malloc (%u) == NULL", sizeof (hddname_t));
+                               syslog (LOG_ERR, "hddtemp: malloc (%u) == NULL",
+                                               (unsigned int) sizeof (hddname_t));
                                free (name);
                                continue;
                        }
@@ -368,6 +374,7 @@ static void hddtemp_init (void)
                                first_hddname = entry;
                        }
                }
+               fclose (fh);
        }
        else
                DBG ("Could not open /proc/partitions: %s",