d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify/optimize RB_NFIND().

Browse Source 
Submitted by:	Andriy Gapon <avg@icyb.net.ua>
This commit is contained in:
jasone 2007-06-15 16:09:47 +00:00
parent 2028ab4002
commit dcc9802ef6
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/sys/tree.h
View File

@ -643,29 +643,21 @@ name##_RB_FIND(struct name *head, struct type *elm) \
attr struct type * \
name##_RB_NFIND(struct name *head, struct type *elm) \
{ \
struct type *ret = RB_ROOT(head); \
struct type *tmp; \
struct type *tmp = RB_ROOT(head); \
struct type *res = NULL; \
int comp; \
while (ret && (comp = cmp(elm, ret)) != 0) { \
while (tmp) { \
comp = cmp(elm, tmp); \
if (comp < 0) { \
if ((tmp = RB_LEFT(ret, field)) == NULL) \
break; \
ret = tmp; \
} else { \
if ((tmp = RB_RIGHT(ret, field)) == NULL) { \
tmp = ret; \
ret = RB_PARENT(ret, field); \
while (ret && tmp == RB_RIGHT(ret, \
field)) { \
tmp = ret; \
ret = RB_PARENT(ret, field); \
} \
break; \
} \
ret = tmp; \
res = tmp; \
tmp = RB_LEFT(tmp, field); \
} \
else if (comp > 0) \
tmp = RB_RIGHT(tmp, field); \
else \
return (tmp); \
} \
return (ret); \
return (res); \
} \
\
/* ARGSUSED */ \