mirror/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git synced 2026-02-21 11:23:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: pattern: make the delete and prune functions more generic

Browse Source 
Now we have a single prune() function to act on an expression, and one
delete function for the lists and one for the trees. The presence of a
pointer in the lists is enough to warrant a free, and we rely on the
PAT_SF_REGFREE flag to decide whether to free using free() or regfree().
This commit is contained in:
Willy Tarreau
2020-11-02 19:26:02 +01:00
parent 9b5c8bbc89
commit 6d8a68914e
4 changed files with 42 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/haproxy/pattern.h
View File

@@ -83,11 +83,9 @@ int pat_idx_tree_pfx(struct pattern_expr *expr, struct pattern *pat, char **err)
* never fails.
*
*/
void pat_del_list_val(struct pattern_expr *expr, struct pat_ref_elt *ref);
void pat_del_list_gen(struct pattern_expr *expr, struct pat_ref_elt *ref);
void pat_del_tree_ip(struct pattern_expr *expr, struct pat_ref_elt *ref);
void pat_del_list_ptr(struct pattern_expr *expr, struct pat_ref_elt *ref);
void pat_del_tree_str(struct pattern_expr *expr, struct pat_ref_elt *ref);
void pat_del_list_reg(struct pattern_expr *expr, struct pat_ref_elt *ref);
/*
*
@@ -95,9 +93,7 @@ void pat_del_list_reg(struct pattern_expr *expr, struct pat_ref_elt *ref);
* reset the tree and list root.
*
*/
void pat_prune_val(struct pattern_expr *expr);
void pat_prune_ptr(struct pattern_expr *expr);
void pat_prune_reg(struct pattern_expr *expr);
void pat_prune_gen(struct pattern_expr *expr);
/*
*