X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/a5338b60e111972364a8bc6f07011c6defd213d2..ab281459f86543c6b8c11ecccc3e743c3d69577e:/lunaix-os/kernel/ds/btrie.c?ds=sidebyside diff --git a/lunaix-os/kernel/ds/btrie.c b/lunaix-os/kernel/ds/btrie.c index fd173b9..8a4380e 100644 --- a/lunaix-os/kernel/ds/btrie.c +++ b/lunaix-os/kernel/ds/btrie.c @@ -83,15 +83,16 @@ btrie_set(struct btrie* root, uint32_t index, void* data) } 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); } } } @@ -104,7 +105,11 @@ btrie_remove(struct btrie* root, uint32_t index) return 0; } void* data = node->data; - __btrie_remove(node); + if (!llist_empty(&node->children)) { + node->data = NULL; + } else { + __btrie_rm_recursive(node); + } return data; }