RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-01 00:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: pattern: import acl_find_match_name() into pattern.h

Browse Source 
It's only dedicated to pattern match lookups, so it was renamed
pat_find_match_name().
This commit is contained in:
Willy Tarreau 2013-11-28 22:24:25 +01:00
parent 0cba607400
commit 6f8fe310cf
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/proto/pattern.h
View File

@ -22,6 +22,8 @@
#ifndef _PROTO_PATTERN_H #ifndef _PROTO_PATTERN_H
#define _PROTO_PATTERN_H #define _PROTO_PATTERN_H
#include <string.h>
#include <common/config.h> #include <common/config.h>
#include <common/standard.h> #include <common/standard.h>
#include <types/pattern.h> #include <types/pattern.h>
@ -41,6 +43,17 @@
*/ */
int pattern_register(struct pattern_expr *expr, char *text, struct sample_storage *smp, struct pattern **pattern, int patflags, char **err); int pattern_register(struct pattern_expr *expr, char *text, struct sample_storage *smp, struct pattern **pattern, int patflags, char **err);
/* return the PAT_MATCH_* index for match name "name", or < 0 if not found */
static inline int pat_find_match_name(const char *name)
{
int i;
for (i = 0; i < PAT_MATCH_NUM; i++)
if (strcmp(name, pat_match_names[i]) == 0)
return i;
return -1;
}
/* This function executes a pattern match on a sample. It applies pattern <expr> /* This function executes a pattern match on a sample. It applies pattern <expr>
* to sample <smp>. If <sample> is not NULL, a pointer to an optional sample * to sample <smp>. If <sample> is not NULL, a pointer to an optional sample
* associated to the matching patterned will be put there. The function returns * associated to the matching patterned will be put there. The function returns

13
src/acl.c
View File

@ -38,17 +38,6 @@ static struct acl_kw_list acl_keywords = {
.list = LIST_HEAD_INIT(acl_keywords.list) .list = LIST_HEAD_INIT(acl_keywords.list)
}; };
/* return the PAT_MATCH_* index for match name "name", or < 0 if not found */
static int acl_find_match_name(const char *name)
{
int i;
for (i = 0; i < PAT_MATCH_NUM; i++)
if (strcmp(name, pat_match_names[i]) == 0)
return i;
return -1;
}
/* input values are 0 or 3, output is the same */ /* input values are 0 or 3, output is the same */
static inline enum acl_test_res pat2acl(enum pat_match_res res) static inline enum acl_test_res pat2acl(enum pat_match_res res)
{ {
@ -474,7 +463,7 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list *
goto out_free_expr; goto out_free_expr;
} }
idx = acl_find_match_name(args[1]); idx = pat_find_match_name(args[1]);
if (idx < 0) { if (idx < 0) {
memprintf(err, "unknown matching method '%s' when parsing ACL expression", args[1]); memprintf(err, "unknown matching method '%s' when parsing ACL expression", args[1]);
goto out_free_expr; goto out_free_expr;