Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-27 15:10:53 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Add r_rbtree_cont_node_{first/last} (siol_eternal) ##util

Browse Source
This commit is contained in:
condret 2021-05-30 04:29:32 +02:00
parent 70d533b488
commit 5b7af01189
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/include/r_util/r_rbtree.h
View File

@ -113,6 +113,8 @@ R_API bool r_rbtree_cont_delete(RContRBTree *tree, void *data, RContRBCmp cmp, v
R_API RContRBNode *r_rbtree_cont_find_node(RContRBTree *tree, void *data, RContRBCmp cmp, void *user); R_API RContRBNode *r_rbtree_cont_find_node(RContRBTree *tree, void *data, RContRBCmp cmp, void *user);
R_API RContRBNode *r_rbtree_cont_node_next(RContRBNode *node); R_API RContRBNode *r_rbtree_cont_node_next(RContRBNode *node);
R_API RContRBNode *r_rbtree_cont_node_prev(RContRBNode *node); R_API RContRBNode *r_rbtree_cont_node_prev(RContRBNode *node);
R_API RContRBNode *r_rbtree_cont_node_first(RContRBTree *tree);
R_API RContRBNode *r_rbtree_cont_node_last(RContRBTree *tree);
R_API void *r_rbtree_cont_find(RContRBTree *tree, void *data, RContRBCmp cmp, void *user); R_API void *r_rbtree_cont_find(RContRBTree *tree, void *data, RContRBCmp cmp, void *user);
R_API void *r_rbtree_cont_first(RContRBTree *tree); R_API void *r_rbtree_cont_first(RContRBTree *tree);
R_API void *r_rbtree_cont_last(RContRBTree *tree); R_API void *r_rbtree_cont_last(RContRBTree *tree);

34
libr/util/rbtree.c
View File

@ -576,9 +576,8 @@ R_API RContRBNode *r_rbtree_cont_node_prev(RContRBNode *node) {
return (container_of (parent, RContRBNode, node)); return (container_of (parent, RContRBNode, node));
} }
// not a direct pendant to r_rbtree_first, but similar // pendant to r_rbtree_first
// returns first element in the tree, not an iter or a node R_API RContRBNode *r_rbtree_cont_node_first(RContRBTree *tree) {
R_API void *r_rbtree_cont_first(RContRBTree *tree) {
r_return_val_if_fail (tree, NULL); r_return_val_if_fail (tree, NULL);
if (!tree->root) { if (!tree->root) {
// empty tree // empty tree
@ -588,10 +587,11 @@ R_API void *r_rbtree_cont_first(RContRBTree *tree) {
while (node->child[0]) { while (node->child[0]) {
node = node->child[0]; node = node->child[0];
} }
return (container_of (node, RContRBNode, node))->data; return container_of (node, RContRBNode, node);
} }
R_API void *r_rbtree_cont_last(RContRBTree *tree) { // pendant to r_rbtree_last
R_API RContRBNode *r_rbtree_cont_node_last(RContRBTree *tree) {
r_return_val_if_fail (tree, NULL); r_return_val_if_fail (tree, NULL);
if (!tree->root) { if (!tree->root) {
// empty tree // empty tree
@ -601,7 +601,29 @@ R_API void *r_rbtree_cont_last(RContRBTree *tree) {
while (node->child[1]) { while (node->child[1]) {
node = node->child[1]; node = node->child[1];
} }
return (container_of (node, RContRBNode, node))->data; return container_of (node, RContRBNode, node);
}
// not a direct pendant to r_rbtree_first, but similar
// returns first element in the tree, not an iter or a node
R_API void *r_rbtree_cont_first(RContRBTree *tree) {
r_return_val_if_fail (tree, NULL);
RContRBNode *first = r_rbtree_cont_node_first (tree);
if (!first) {
// empty tree
return NULL;
}
return first->data;
}
R_API void *r_rbtree_cont_last(RContRBTree *tree) {
r_return_val_if_fail (tree, NULL);
RContRBNode *last = r_rbtree_cont_node_last (tree);
if (!last) {
// empty tree
return NULL;
}
return last->data;
} }
R_API void r_rbtree_cont_free(RContRBTree *tree) { R_API void r_rbtree_cont_free(RContRBTree *tree) {