#include <ccan/rbtree/rbtree.h>
static void
-tree_destructor_traverse_node(TALLOC_CTX *mem_ctx, trbt_node_t *node)
+tree_destructor_traverse_node(trbt_node_t *node)
{
talloc_set_destructor(node, NULL);
if (node->left) {
- tree_destructor_traverse_node(mem_ctx, node->left);
+ tree_destructor_traverse_node(node->left);
}
if (node->right) {
- tree_destructor_traverse_node(mem_ctx, node->right);
+ tree_destructor_traverse_node(node->right);
}
- talloc_steal(mem_ctx, node);
+ talloc_free(node);
}
/*
*/
static int tree_destructor(trbt_tree_t *tree)
{
- TALLOC_CTX *tmp_ctx;
trbt_node_t *node;
if (tree == NULL) {
return 0;
}
- /* traverse the tree and remove the node destructor and steal
- the node to the temporary context.
+ /* traverse the tree and remove the node destructor then delete it.
we dont want to use the existing destructor for the node
since that will remove the nodes one by one from the tree.
since the entire tree will be completely destroyed we dont care
if it is inconsistent or unbalanced while freeing the
individual nodes
*/
- tmp_ctx = talloc_new(NULL);
- tree_destructor_traverse_node(tmp_ctx, node);
- talloc_free(tmp_ctx);
+ tree_destructor_traverse_node(node);
return 0;
}
}
static void
-delete_node(trbt_node_t *node, int from_destructor)
+delete_node(trbt_node_t *node)
{
trbt_node_t *parent, *child, dc;
trbt_node_t *temp = NULL;
/* then delete the temp node.
this node is guaranteed to have at least one leaf
child */
- delete_node(temp, from_destructor);
+ delete_node(temp);
goto finished;
}
}
finished:
- if (!from_destructor) {
- talloc_free(node);
- }
-
/* if we came from a destructor and temp!=NULL this means we
did the node-swap but now the tree still contains the old
node which was freed in the destructor. Not good.
*/
- if (from_destructor && temp) {
+ if (temp) {
temp->key32 = node->key32;
temp->rb_color = node->rb_color;
*/
static int node_destructor(trbt_node_t *node)
{
- delete_node(node, 1);
+ delete_node(node);
return 0;
}
trbt_node_t *new_node;
new_node = trbt_create_node(tree, node, key, data);
+ if (!new_node)
+ return NULL;
node->left=new_node;
node=new_node;
trbt_node_t *new_node;
new_node = trbt_create_node(tree, node, key, data);
+ if (!new_node)
+ return NULL;
node->right=new_node;
node=new_node;
break;
while(node){
if(key==node->key32){
- delete_node(node, 0);
+ talloc_free(node);
return;
}
if(key<node->key32){