X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_fbhash.c;h=d1a580cd632420d0ab25e9a6186d5210e63d6b55;hb=ab11d1b4db61f750f51be6e41dbe8320d3c65404;hp=cbd150610205255a8a20478a324175a7feebd35a;hpb=f9a6df05238501ca41931af0d8d51acea716c105;p=collectd.git diff --git a/src/utils_fbhash.c b/src/utils_fbhash.c index cbd15061..d1a580cd 100644 --- a/src/utils_fbhash.c +++ b/src/utils_fbhash.c @@ -27,8 +27,6 @@ #include "collectd.h" #include "plugin.h" -#include - #include "utils_fbhash.h" #include "utils_avltree.h" @@ -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); @@ -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)