mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-11 12:41:00 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: pattern: Remove the flag "PAT_F_FROM_FILE".

Browse Source 
This flag is no longer used. The last place using this, are the display
of the result of pattern matching in the cli command "get map" or "get
acl".

The first parameter of this command is the reference of the file used to
perform the lookup.
This commit is contained in:
Thierry FOURNIER 2014-02-11 16:19:46 +01:00 committed by Willy Tarreau
parent fc7ac7b89c
commit 66eb9bf691
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/types/pattern.h
View File

@ -64,8 +64,7 @@ enum pat_match_res {
/* possible flags for expressions or patterns */
enum {
PAT_F_IGNORE_CASE = 1 << 0, /* ignore case */
PAT_F_FROM_FILE = 1 << 1, /* pattern comes from a file */
PAT_F_TREE = 1 << 2, /* some patterns are arranged in a tree */
PAT_F_TREE = 1 << 1, /* some patterns are arranged in a tree */
};
/* ACL match methods */

2
src/acl.c
View File

@ -449,7 +449,7 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list *
goto out_free_expr;
}
if (!pattern_read_from_file(&expr->pat, PAT_REF_ACL, args[1], patflags | PAT_F_FROM_FILE, load_as_map, err, file, line))
if (!pattern_read_from_file(&expr->pat, PAT_REF_ACL, args[1], patflags, load_as_map, err, file, line))
goto out_free_expr;
is_loaded = 1;
args++;

6
src/dumpstats.c
View File

@ -4990,12 +4990,6 @@ static int stats_map_lookup(struct stream_interface *si)
else
chunk_appendf(&trash, ", case=sensitive");
/* display source */
if (pat->flags & PAT_F_FROM_FILE)
chunk_appendf(&trash, ", src=file");
else
chunk_appendf(&trash, ", src=conf");
/* display pattern */
if (appctx->ctx.map.display_flags == PAT_REF_MAP) {
if (pat->ref && pat->ref->pattern)