mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

[CLEANUP] acl: make use of eb_is_empty() instead of open coding the tree's emptiness test

Browse Source 
Since ebtree 6.0.1, we now have eb_is_empty() which is cleaner and safer to
use than checking the left pointer of the tree, so let's use that.
This commit is contained in:
Willy Tarreau 2010-05-16 21:45:45 +02:00
parent fdc1018771
commit 020534d6f7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/acl.c
View File

@ -1315,7 +1315,7 @@ int acl_exec_cond(struct acl_cond *cond, struct proxy *px, struct session *l4, v
acl_res |= ACL_PAT_FAIL;
}
else {
if (expr->pattern_tree.b[EB_LEFT]) {
if (!eb_is_empty(&expr->pattern_tree)) {
/* a tree is present, let's check what type it is */
if (expr->kw->match == acl_match_str)
acl_res |= acl_lookup_str(&test, expr) ? ACL_PAT_PASS : ACL_PAT_FAIL;
@ -1331,7 +1331,7 @@ int acl_exec_cond(struct acl_cond *cond, struct proxy *px, struct session *l4, v
}
if ((test.flags & ACL_TEST_F_NULL_MATCH) &&
LIST_ISEMPTY(&expr->patterns) && !expr->pattern_tree.b[EB_LEFT])
LIST_ISEMPTY(&expr->patterns) && eb_is_empty(&expr->pattern_tree))
acl_res |= expr->kw->match(&test, NULL);
}
/*