DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avl.c: remove compat macros and switch to the argument order from list.h

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau 2014-03-20 22:54:59 +01:00
parent 4f44401ae8
commit 3edc29942c
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
avl.c
View file

@ -47,10 +47,6 @@
#include "avl.h" #include "avl.h"
#include "list.h" #include "list.h"
#define list_merge(_head, _list) list_merge(_list, _head)
#define list_is_last(_head, _list) list_is_last(_list, _head)
#define list_is_first(_head, _list) list_is_first(_list, _head)
/** /**
* internal type save inline function to calculate the maximum of * internal type save inline function to calculate the maximum of
* to integers without macro implementation. * to integers without macro implementation.
@ -143,7 +139,7 @@ avl_find_lessequal(const struct avl_tree *tree, const void *key) {
/* go left as long as key<node.key */ /* go left as long as key<node.key */
while (diff < 0) { while (diff < 0) {
if (list_is_first(&tree->list_head, &node->list)) { if (list_is_first(&node->list, &tree->list_head)) {
return NULL; return NULL;
} }
@ -155,7 +151,7 @@ avl_find_lessequal(const struct avl_tree *tree, const void *key) {
next = node; next = node;
while (diff >= 0) { while (diff >= 0) {
node = next; node = next;
if (list_is_last(&tree->list_head, &node->list)) { if (list_is_last(&node->list, &tree->list_head)) {
break; break;
} }
@ -185,7 +181,7 @@ avl_find_greaterequal(const struct avl_tree *tree, const void *key) {
/* go right as long as key>node.key */ /* go right as long as key>node.key */
while (diff > 0) { while (diff > 0) {
if (list_is_last(&tree->list_head, &node->list)) { if (list_is_last(&node->list, &tree->list_head)) {
return NULL; return NULL;
} }
@ -197,7 +193,7 @@ avl_find_greaterequal(const struct avl_tree *tree, const void *key) {
next = node; next = node;
while (diff <= 0) { while (diff <= 0) {
node = next; node = next;
if (list_is_first(&tree->list_head, &node->list)) { if (list_is_first(&node->list, &tree->list_head)) {
break; break;
} }
@ -239,7 +235,7 @@ avl_insert(struct avl_tree *tree, struct avl_node *new)
last = node; last = node;
while (!list_is_last(&tree->list_head, &last->list)) { while (!list_is_last(&last->list, &tree->list_head)) {
next = list_next_element(last, list); next = list_next_element(last, list);
if (next->leader) { if (next->leader) {
break; break;
@ -310,7 +306,7 @@ avl_delete(struct avl_tree *tree, struct avl_node *node)
struct avl_node *right; struct avl_node *right;
if (node->leader) { if (node->leader) {
if (tree->allow_dups if (tree->allow_dups
&& !list_is_last(&tree->list_head, &node->list) && !list_is_last(&node->list, &tree->list_head)
&& !(next = list_next_element(node, list))->leader) { && !(next = list_next_element(node, list))->leader) {
next->leader = true; next->leader = true;
next->balance = node->balance; next->balance = node->balance;