netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org, Eric Leblond <eric@regit.org>,
	Florian Westphal <fw@strlen.de>
Subject: [nft PATCH v2 4/5] rule: Refactor chain_print_declaration()
Date: Thu, 28 Sep 2017 17:17:44 +0200	[thread overview]
Message-ID: <20170928151745.28426-5-phil@nwl.cc> (raw)
In-Reply-To: <20170928151745.28426-1-phil@nwl.cc>

Instead of having two nearly identical printf() calls for netdev and
other chains, print the common parts separately and include the device
bit only for netdev chains.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 src/rule.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/rule.c b/src/rule.c
index 85505aecd5091..91129734a3d8f 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -666,18 +666,12 @@ static void chain_print_declaration(const struct chain *chain)
 {
 	printf("\tchain %s {\n", chain->handle.chain);
 	if (chain->flags & CHAIN_F_BASECHAIN) {
-		if (chain->dev != NULL) {
-			printf("\t\ttype %s hook %s device %s priority %d; policy %s;\n",
-			       chain->type,
-			       hooknum2str(chain->handle.family, chain->hooknum),
-			       chain->dev, chain->priority,
-			       chain_policy2str(chain->policy));
-		} else {
-			printf("\t\ttype %s hook %s priority %d; policy %s;\n",
-			       chain->type,
-			       hooknum2str(chain->handle.family, chain->hooknum),
-			       chain->priority, chain_policy2str(chain->policy));
-		}
+		printf("\t\ttype %s hook %s", chain->type,
+		       hooknum2str(chain->handle.family, chain->hooknum));
+		if (chain->dev != NULL)
+			printf(" device %s", chain->dev);
+		printf(" priority %d; policy %s;\n",
+		       chain->priority, chain_policy2str(chain->policy));
 	}
 }
 
-- 
2.13.1


  parent reply	other threads:[~2017-09-28 15:18 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-28 15:17 [nft PATCH v2 0/5] Get output under application control Phil Sutter
2017-09-28 15:17 ` [nft PATCH v2 1/5] rule: Use C99-style initializer in cache_init() Phil Sutter
2017-09-29 10:25   ` Pablo Neira Ayuso
2017-09-28 15:17 ` [nft PATCH v2 2/5] exthdr: Simplify tcp option printing a bit Phil Sutter
2017-09-29 10:25   ` Pablo Neira Ayuso
2017-09-28 15:17 ` [nft PATCH v2 3/5] erec_print: Pass output FILE pointer to netlink_dump_expr() Phil Sutter
2017-09-29 10:26   ` Pablo Neira Ayuso
2017-09-28 15:17 ` Phil Sutter [this message]
2017-09-29 10:26   ` [nft PATCH v2 4/5] rule: Refactor chain_print_declaration() Pablo Neira Ayuso
2017-09-28 15:17 ` [nft PATCH v2 5/5] src: get rid of printf Phil Sutter
2017-09-29 10:38   ` Pablo Neira Ayuso
2017-09-29 10:57     ` Phil Sutter
2017-09-29 11:19       ` Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170928151745.28426-5-phil@nwl.cc \
    --to=phil@nwl.cc \
    --cc=eric@regit.org \
    --cc=fw@strlen.de \
    --cc=netfilter-devel@vger.kernel.org \
    --cc=pablo@netfilter.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).