From b2a844760ec534e75bcc2dc513275cf0fed11468 Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Thu, 30 Mar 2017 00:57:43 +0530 Subject: iptables: Remove unnecessary braces. Remove braces which are not required, to fix the check patch issue. The following coccinelle script was used to fix this issue. @@ expression e; expression e1; @@ if(e) -{ e1; -} Signed-off-by: Varsha Rao Signed-off-by: Pablo Neira Ayuso --- iptables/iptables-standalone.c | 3 +-- iptables/iptables.c | 3 +-- iptables/xtables-standalone.c | 3 +-- iptables/xtables-translate.c | 6 ++---- 4 files changed, 5 insertions(+), 10 deletions(-) (limited to 'iptables') diff --git a/iptables/iptables-standalone.c b/iptables/iptables-standalone.c index 4da1d7f8..c211fb73 100644 --- a/iptables/iptables-standalone.c +++ b/iptables/iptables-standalone.c @@ -73,9 +73,8 @@ iptables_main(int argc, char *argv[]) fprintf(stderr, "iptables: %s.\n", iptc_strerror(errno)); } - if (errno == EAGAIN) { + if (errno == EAGAIN) exit(RESOURCE_PROBLEM); - } } exit(!ret); diff --git a/iptables/iptables.c b/iptables/iptables.c index 62731c5e..97cbda91 100644 --- a/iptables/iptables.c +++ b/iptables/iptables.c @@ -1114,9 +1114,8 @@ void print_rule4(const struct ipt_entry *e, e->ip.invflags & IPT_INV_FRAG ? " !" : ""); /* Print matchinfo part */ - if (e->target_offset) { + if (e->target_offset) IPT_MATCH_ITERATE(e, print_match_save, &e->ip); - } /* print counters for iptables -R */ if (counters < 0) diff --git a/iptables/xtables-standalone.c b/iptables/xtables-standalone.c index 355a4460..139c477f 100644 --- a/iptables/xtables-standalone.c +++ b/iptables/xtables-standalone.c @@ -85,9 +85,8 @@ xtables_main(int family, const char *progname, int argc, char *argv[]) fprintf(stderr, "iptables: %s.\n", nft_strerror(errno)); } - if (errno == EAGAIN) { + if (errno == EAGAIN) exit(RESOURCE_PROBLEM); - } } exit(!ret); diff --git a/iptables/xtables-translate.c b/iptables/xtables-translate.c index 00de0190..e049f24e 100644 --- a/iptables/xtables-translate.c +++ b/iptables/xtables-translate.c @@ -236,9 +236,8 @@ static int do_command_xlate(struct nft_handle *h, int argc, char *argv[], switch (p.command) { case CMD_APPEND: ret = 1; - if (!xlate(h, &p, &cs, &args, true, nft_rule_xlate_add)) { + if (!xlate(h, &p, &cs, &args, true, nft_rule_xlate_add)) print_ipt_cmd(argc, argv); - } break; case CMD_DELETE: break; @@ -250,9 +249,8 @@ static int do_command_xlate(struct nft_handle *h, int argc, char *argv[], break; case CMD_INSERT: ret = 1; - if (!xlate(h, &p, &cs, &args, false, nft_rule_xlate_add)) { + if (!xlate(h, &p, &cs, &args, false, nft_rule_xlate_add)) print_ipt_cmd(argc, argv); - } break; case CMD_FLUSH: if (p.chain) { -- cgit v1.2.3