Merge pull request #1816 from octo/grpc-free-iter

[collectd.git] / src / utils_fbhash.c

diff --git a/src/utils_fbhash.c b/src/utils_fbhash.c
index 70b8908..d1a580c 100644 (file)
--- a/src/utils_fbhash.c
+++ b/src/utils_fbhash.c
@@ -27,8 +27,6 @@
 #include "collectd.h"
 #include "plugin.h"
 
-#include <pthread.h>
-
 #include "utils_fbhash.h"
 #include "utils_avltree.h"
 
@@ -41,7 +39,7 @@ struct fbhash_s
   c_avl_tree_t *tree;
 };
 
-/* 
+/*
  * Private functions
  */
 static void fbh_free_tree (c_avl_tree_t *tree) /* {{{ */
@@ -93,7 +91,7 @@ static int fbh_read_file (fbhash_t *h) /* {{{ */
     return (-1);
   }
 
-  tree = c_avl_create ((void *) strcmp);
+  tree = c_avl_create ((int (*) (const void *, const void *)) strcmp);
   if (tree == NULL)
   {
     fclose (fh);
@@ -198,7 +196,7 @@ static int fbh_check_file (fbhash_t *h) /* {{{ */
   return (status);
 } /* }}} int fbh_check_file */
 
-/* 
+/*
  * Public functions
  */
 fbhash_t *fbh_create (const char *file) /* {{{ */
@@ -209,10 +207,9 @@ fbhash_t *fbh_create (const char *file) /* {{{ */
   if (file == NULL)
     return (NULL);
 
-  h = malloc (sizeof (*h));
+  h = calloc (1, sizeof (*h));
   if (h == NULL)
     return (NULL);
-  memset (h, 0, sizeof (*h));
 
   h->filename = strdup (file);
   if (h->filename == NULL)
@@ -228,6 +225,7 @@ fbhash_t *fbh_create (const char *file) /* {{{ */
   if (status != 0)
   {
     fbh_destroy (h);
+    free (h);
     return (NULL);
   }