CLEANUP: http/tcp actions: remove the scope member

The scope member is not used. This patch removes this entry.

diff --git a/include/types/proto_http.h b/include/types/proto_http.h
index 088c74868091d9db5f53c67ac2b3b9db15bb2516..d6f916600c343176643bba7aa59ae2f267607c72 100644 (file)
--- a/include/types/proto_http.h
+++ b/include/types/proto_http.h
@@ -544,13 +544,11 @@ struct http_res_action_kw {
 };
 
 struct http_req_action_kw_list {
-       const char *scope;
        struct list list;
        struct http_req_action_kw kw[VAR_ARRAY];
 };
 
 struct http_res_action_kw_list {
-       const char *scope;
        struct list list;
        struct http_res_action_kw kw[VAR_ARRAY];
 };

diff --git a/include/types/proto_tcp.h b/include/types/proto_tcp.h
index d34ff035cba9f235056d58f8388d1c26d13defbf..20b8a9f2c6122742702755223c0b849358a0d4d5 100644 (file)
--- a/include/types/proto_tcp.h
+++ b/include/types/proto_tcp.h
@@ -69,7 +69,6 @@ struct tcp_action_kw {
 };
 
 struct tcp_action_kw_list {
-       const char *scope;
        struct list list;
        struct tcp_action_kw kw[VAR_ARRAY];
 };

diff --git a/src/hlua.c b/src/hlua.c
index f2e58a9047dcadebb6329d5a1e20f2024a829354..3a325b75bdb6716bcf5969a0d14f244fb20205ff 100644 (file)
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -4588,22 +4588,22 @@ static struct cfg_kw_list cfg_kws = {{ },{
        { 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 },
        { 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 },
        { 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 },
        { 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 },
        { NULL, NULL }
 }};

diff --git a/src/proto_http.c b/src/proto_http.c
index d5b2c69b6d06c8271a87898fe2a287a1be21dc42..093594055f352e60e885c33de0d7505c83445196 100644 (file)
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -12899,7 +12899,6 @@ static struct sample_conv_kw_list sample_conv_kws = {ILH, {
 /*   All supported http-request action keywords must be declared here.  */
 /************************************************************************/
 struct http_req_action_kw_list http_req_actions = {
-       .scope = "http",
        .kw = {
                { "capture",    parse_http_req_capture },
                { "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 = {
-       .scope = "http",
        .kw = {
                { "capture",    parse_http_res_capture },
                { NULL, NULL }

diff --git a/src/vars.c b/src/vars.c
index 5a2a5729b96b4a49c8533ce712e5305eab0c7b3b..d233c8885aa69f945f97a42f83a2cc14f8bdd4e6 100644 (file)
--- a/src/vars.c
+++ b/src/vars.c
@@ -766,22 +766,22 @@ static struct sample_conv_kw_list sample_conv_kws = {ILH, {
        { /* 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 },
        { /* 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 },
        { /* 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 },
        { /* 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 },
        { /* END */ }
 }};