RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-15 16:04:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: http_rules: do not declare http_*_keywords_registre() inline

Browse Source 
The 3 functions http_{req,res,after_res}_keywords_register() are
referenced in initcalls by their pointer, it makes no sense to declare
them inline. At best it causes function duplication, at worst it doesn't
build on older compilers.
This commit is contained in:
Willy Tarreau 2022-03-02 14:50:38 +01:00
parent d318e4e022
commit 368479c3fc
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/haproxy/http_rules.h
View File

@ -37,20 +37,9 @@ struct act_rule *parse_http_after_res_cond(const char **args, const char *file,
struct redirect_rule *http_parse_redirect_rule(const char *file, int linenum, struct proxy *curproxy,
const char **args, char **errmsg, int use_fmt, int dir);
static inline void http_req_keywords_register(struct action_kw_list *kw_list)
{
LIST_APPEND(&http_req_keywords.list, &kw_list->list);
}
static inline void http_res_keywords_register(struct action_kw_list *kw_list)
{
LIST_APPEND(&http_res_keywords.list, &kw_list->list);
}
static inline void http_after_res_keywords_register(struct action_kw_list *kw_list)
{
LIST_APPEND(&http_after_res_keywords.list, &kw_list->list);
}
void http_req_keywords_register(struct action_kw_list *kw_list);
void http_res_keywords_register(struct action_kw_list *kw_list);
void http_after_res_keywords_register(struct action_kw_list *kw_list);
struct action_kw *action_http_req_custom(const char *kw);
struct action_kw *action_http_res_custom(const char *kw);

15
src/http_rules.c
View File

@ -50,6 +50,21 @@ struct action_kw_list http_after_res_keywords = {
.list = LIST_HEAD_INIT(http_after_res_keywords.list)
};
void http_req_keywords_register(struct action_kw_list *kw_list)
{
LIST_APPEND(&http_req_keywords.list, &kw_list->list);
}
void http_res_keywords_register(struct action_kw_list *kw_list)
{
LIST_APPEND(&http_res_keywords.list, &kw_list->list);
}
void http_after_res_keywords_register(struct action_kw_list *kw_list)
{
LIST_APPEND(&http_after_res_keywords.list, &kw_list->list);
}
/*
* Return the struct http_req_action_kw associated to a keyword.
*/