From 88c44060855db67a13170886720658e11ef09763 Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Thu, 7 Oct 2021 21:12:22 +0100 Subject: rule: replace three conditionals with one When outputting set definitions, merge three consecutive `if (!list_empty(&set->stmt_list))` conditionals. Signed-off-by: Jeremy Sowden Signed-off-by: Pablo Neira Ayuso --- src/rule.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/rule.c b/src/rule.c index b566adf0..7c048fcc 100644 --- a/src/rule.c +++ b/src/rule.c @@ -366,12 +366,11 @@ static void set_print_declaration(const struct set *set, nft_print(octx, "%s", opts->stmt_separator); } - if (!list_empty(&set->stmt_list)) - nft_print(octx, "%s%s", opts->tab, opts->tab); - if (!list_empty(&set->stmt_list)) { unsigned int flags = octx->flags; + nft_print(octx, "%s%s", opts->tab, opts->tab); + octx->flags |= NFT_CTX_OUTPUT_STATELESS; list_for_each_entry(stmt, &set->stmt_list, list) { stmt_print(stmt, octx); @@ -379,10 +378,9 @@ static void set_print_declaration(const struct set *set, nft_print(octx, " "); } octx->flags = flags; - } - if (!list_empty(&set->stmt_list)) nft_print(octx, "%s", opts->stmt_separator); + } if (set->automerge) nft_print(octx, "%s%sauto-merge%s", opts->tab, opts->tab, -- cgit v1.2.3