X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnut.c;h=a033e2f668503520eb8860fc8bf54f2354d803d3;hb=290741f2e6de9e9b467463c1f0c6f031c4036428;hp=d5ecc98de12b13a811f7e36fc131eaf36dfb6c19;hpb=c21ce3b44f63d706b8b200a88047db74f1a51392;p=collectd.git

diff --git a/src/nut.c b/src/nut.c
index d5ecc98d..a033e2f6 100644
--- a/src/nut.c
+++ b/src/nut.c
@@ -28,7 +28,6 @@
 #include "common.h"
 #include "plugin.h"
 
-#include <pthread.h>
 #include <upsclient.h>
 
 #if HAVE_UPSCONN_T
@@ -80,13 +79,12 @@ static int nut_add_ups (const char *name)
 
   DEBUG ("nut plugin: nut_add_ups (name = %s);", name);
 
-  ups = (nut_ups_t *) malloc (sizeof (nut_ups_t));
+  ups = calloc (1, sizeof (*ups));
   if (ups == NULL)
   {
-    ERROR ("nut plugin: nut_add_ups: malloc failed.");
+    ERROR ("nut plugin: nut_add_ups: calloc failed.");
     return (1);
   }
-  memset (ups, '\0', sizeof (nut_ups_t));
 
   status = upscli_splitname (name, &ups->upsname, &ups->hostname,
       &ups->port);
@@ -152,7 +150,7 @@ static int nut_read_one (nut_ups_t *ups)
   /* (Re-)Connect if we have no connection */
   if (ups->conn == NULL)
   {
-    ups->conn = (collectd_upsconn_t *) malloc (sizeof (collectd_upsconn_t));
+    ups->conn = malloc (sizeof (*ups->conn));
     if (ups->conn == NULL)
     {
       ERROR ("nut plugin: malloc failed.");