git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
feat: add support for process to conduct Intel x87 and MMX related task.
[lunaix-os.git]
/
lunaix-os
/
kernel
/
ds
/
btrie.c
diff --git
a/lunaix-os/kernel/ds/btrie.c
b/lunaix-os/kernel/ds/btrie.c
index fd173b9455c701b99ff60b12ed9ae7a3acb7b01c..8a4380e4c19da2320979f8462a71c5ee367c9b1b 100644
(file)
--- 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
}
void
-__btrie_r
emo
ve(struct btrie_node* node)
+__btrie_r
m_recursi
ve(struct btrie_node* node)
{
struct btrie_node* parent = node->parent;
{
struct btrie_node* parent = node->parent;
+
if (parent) {
llist_delete(&node->siblings);
llist_delete(&node->nodes);
vfree(node);
if (parent) {
llist_delete(&node->siblings);
llist_delete(&node->nodes);
vfree(node);
- if (llist_empty(&parent->children)) {
- __btrie_r
emo
ve(parent);
+ if (llist_empty(&parent->children)
&& !parent->data
) {
+ __btrie_r
m_recursi
ve(parent);
}
}
}
}
}
}
@@
-104,7
+105,11
@@
btrie_remove(struct btrie* root, uint32_t index)
return 0;
}
void* data = node->data;
return 0;
}
void* data = node->data;
- __btrie_remove(node);
+ if (!llist_empty(&node->children)) {
+ node->data = NULL;
+ } else {
+ __btrie_rm_recursive(node);
+ }
return data;
}
return data;
}