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

CLEANUP: http/tcp actions: remove the scope member

Browse Source 
The scope member is not used. This patch removes this entry.
This commit is contained in:
Thierry FOURNIER 2015-08-11 10:59:49 +02:00 committed by Willy Tarreau
parent 9b49f589ed
commit a6b6343cff
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/types/proto_http.h
View File

@ -544,13 +544,11 @@ struct http_res_action_kw {
}; };
struct http_req_action_kw_list { struct http_req_action_kw_list {
const char *scope;
struct list list; struct list list;
struct http_req_action_kw kw[VAR_ARRAY]; struct http_req_action_kw kw[VAR_ARRAY];
}; };
struct http_res_action_kw_list { struct http_res_action_kw_list {
const char *scope;
struct list list; struct list list;
struct http_res_action_kw kw[VAR_ARRAY]; struct http_res_action_kw kw[VAR_ARRAY];
}; };

1
include/types/proto_tcp.h
View File

@ -69,7 +69,6 @@ struct tcp_action_kw {
}; };
struct tcp_action_kw_list { struct tcp_action_kw_list {
const char *scope;
struct list list; struct list list;
struct tcp_action_kw kw[VAR_ARRAY]; struct tcp_action_kw kw[VAR_ARRAY];
}; };

8
src/hlua.c
View File

@ -4588,22 +4588,22 @@ static struct cfg_kw_list cfg_kws = {{ },{
{ 0, NULL, NULL }, { 0, NULL, NULL },
}}; }};
static struct http_req_action_kw_list http_req_kws = {"lua", { }, { static struct http_req_action_kw_list http_req_kws = { { }, {
{ "lua", http_req_action_register_lua }, { "lua", http_req_action_register_lua },
{ NULL, NULL } { NULL, NULL }
}}; }};
static struct http_res_action_kw_list http_res_kws = {"lua", { }, { static struct http_res_action_kw_list http_res_kws = { { }, {
{ "lua", http_res_action_register_lua }, { "lua", http_res_action_register_lua },
{ NULL, NULL } { NULL, NULL }
}}; }};
static struct tcp_action_kw_list tcp_req_cont_kws = {"lua", { }, { static struct tcp_action_kw_list tcp_req_cont_kws = { { }, {
{ "lua", tcp_req_action_register_lua }, { "lua", tcp_req_action_register_lua },
{ NULL, NULL } { NULL, NULL }
}}; }};
static struct tcp_action_kw_list tcp_res_cont_kws = {"lua", { }, { static struct tcp_action_kw_list tcp_res_cont_kws = { { }, {
{ "lua", tcp_res_action_register_lua }, { "lua", tcp_res_action_register_lua },
{ NULL, NULL } { NULL, NULL }
}}; }};

2
src/proto_http.c
View File

@ -12899,7 +12899,6 @@ static struct sample_conv_kw_list sample_conv_kws = {ILH, {
/* All supported http-request action keywords must be declared here. */ /* All supported http-request action keywords must be declared here. */
/************************************************************************/ /************************************************************************/
struct http_req_action_kw_list http_req_actions = { struct http_req_action_kw_list http_req_actions = {
.scope = "http",
.kw = { .kw = {
{ "capture", parse_http_req_capture }, { "capture", parse_http_req_capture },
{ "set-method", parse_set_req_line }, { "set-method", parse_set_req_line },
@ -12911,7 +12910,6 @@ struct http_req_action_kw_list http_req_actions = {
}; };
struct http_res_action_kw_list http_res_actions = { struct http_res_action_kw_list http_res_actions = {
.scope = "http",
.kw = { .kw = {
{ "capture", parse_http_res_capture }, { "capture", parse_http_res_capture },
{ NULL, NULL } { NULL, NULL }

8
src/vars.c
View File

@ -766,22 +766,22 @@ static struct sample_conv_kw_list sample_conv_kws = {ILH, {
{ /* END */ }, { /* END */ },
}}; }};
static struct tcp_action_kw_list tcp_req_kws = {"vars", { }, { static struct tcp_action_kw_list tcp_req_kws = { { }, {
{ "set-var", parse_tcp_req_store, 1 }, { "set-var", parse_tcp_req_store, 1 },
{ /* END */ } { /* END */ }
}}; }};
static struct tcp_action_kw_list tcp_res_kws = {"vars", { }, { static struct tcp_action_kw_list tcp_res_kws = { { }, {
{ "set-var", parse_tcp_res_store, 1 }, { "set-var", parse_tcp_res_store, 1 },
{ /* END */ } { /* END */ }
}}; }};
static struct http_req_action_kw_list http_req_kws = {"vars", { }, { static struct http_req_action_kw_list http_req_kws = { { }, {
{ "set-var", parse_http_req_store, 1 }, { "set-var", parse_http_req_store, 1 },
{ /* END */ } { /* END */ }
}}; }};
static struct http_res_action_kw_list http_res_kws = {"vars", { }, { static struct http_res_action_kw_list http_res_kws = { { }, {
{ "set-var", parse_http_res_store, 1 }, { "set-var", parse_http_res_store, 1 },
{ /* END */ } { /* END */ }
}}; }};