X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Futils_avltree.c;h=e1c41ecf8fb95c122c9fb2a20c6746a5271e8e5d;hb=474d70e02d04de92aa7503b3887989729bbbff02;hp=fcfbb9453c74e641d5d6c2909fdb430914884de5;hpb=b4cc5c7399adf79198aea816d44a42df25431d15;p=collectd.git

diff --git a/src/daemon/utils_avltree.c b/src/daemon/utils_avltree.c
index fcfbb945..e1c41ecf 100644
--- a/src/daemon/utils_avltree.c
+++ b/src/daemon/utils_avltree.c
@@ -24,11 +24,7 @@
  *   Florian octo Forster <octo at collectd.org>
  **/
 
-#include "config.h"
-
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <assert.h>
 
 #include "utils_avltree.h"
@@ -485,7 +481,7 @@ c_avl_tree_t *c_avl_create (int (*compare) (const void *, const void *))
 	if (compare == NULL)
 		return (NULL);
 
-	if ((t = (c_avl_tree_t *) malloc (sizeof (c_avl_tree_t))) == NULL)
+	if ((t = malloc (sizeof (*t))) == NULL)
 		return (NULL);
 
 	t->root = NULL;
@@ -509,7 +505,7 @@ int c_avl_insert (c_avl_tree_t *t, void *key, void *value)
 	c_avl_node_t *nptr;
 	int cmp;
 
-	if ((new = (c_avl_node_t *) malloc (sizeof (c_avl_node_t))) == NULL)
+	if ((new = malloc (sizeof (*new))) == NULL)
 		return (-1);
 
 	new->key = key;
@@ -665,10 +661,9 @@ c_avl_iterator_t *c_avl_get_iterator (c_avl_tree_t *t)
 	if (t == NULL)
 		return (NULL);
 
-	iter = (c_avl_iterator_t *) malloc (sizeof (c_avl_iterator_t));
+	iter = calloc (1, sizeof (*iter));
 	if (iter == NULL)
 		return (NULL);
-	memset (iter, '\0', sizeof (c_avl_iterator_t));
 	iter->tree = t;
 
 	return (iter);