From: Florian Westphal Date: Mon, 24 Feb 2025 17:52:11 +0000 (+0100) Subject: parser_bison: get rid of unneeded statement X-Git-Tag: v1.1.2~80 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=505703ed8bc2975786645b44974a85b856c8c7c6;p=thirdparty%2Fnftables.git parser_bison: get rid of unneeded statement Was used for the legacy flow statement, but that was removed in 2ee93ca27ddc ("parser_bison: remove deprecated flow statement") Signed-off-by: Florian Westphal Reviewed-by: Pablo Neira Ayuso --- diff --git a/src/parser_bison.y b/src/parser_bison.y index f5512783..e494079d 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -811,8 +811,8 @@ int nft_lex(void *, void *, void *); %type set_stmt_op %type map_stmt %destructor { stmt_free($$); } map_stmt -%type meter_stmt meter_stmt_alloc -%destructor { stmt_free($$); } meter_stmt meter_stmt_alloc +%type meter_stmt +%destructor { stmt_free($$); } meter_stmt %type symbol_expr verdict_expr integer_expr variable_expr chain_expr policy_expr %destructor { expr_free($$); } symbol_expr verdict_expr integer_expr variable_expr chain_expr policy_expr @@ -4192,10 +4192,7 @@ map_stmt : set_stmt_op set_ref_expr '{' set_elem_expr_stmt COLON set_elem_expr_ } ; -meter_stmt : meter_stmt_alloc { $$ = $1; } - ; - -meter_stmt_alloc : METER identifier '{' meter_key_expr stmt '}' +meter_stmt : METER identifier '{' meter_key_expr stmt '}' { $$ = meter_stmt_alloc(&@$); $$->meter.name = $2;