}
void
-__btrie_remove(struct btrie_node* node)
+__btrie_rm_recursive(struct btrie_node* node)
{
struct btrie_node* parent = node->parent;
+
if (parent) {
llist_delete(&node->siblings);
llist_delete(&node->nodes);
vfree(node);
- if (llist_empty(&parent->children)) {
- __btrie_remove(parent);
+ if (llist_empty(&parent->children) && !parent->data) {
+ __btrie_rm_recursive(parent);
}
}
}
return 0;
}
void* data = node->data;
- __btrie_remove(node);
+ if (!llist_empty(&node->children)) {
+ node->data = NULL;
+ } else {
+ __btrie_rm_recursive(node);
+ }
return data;
}