summaryrefslogtreecommitdiffstats
path: root/iptables
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2019-09-17 18:58:17 +0200
committerPhil Sutter <phil@nwl.cc>2019-11-06 13:41:54 +0100
commitf308f944a0c1356fbfa2790d12820e9ab1fa8c54 (patch)
treebeebec265fb7cb3fd2636902d2b2bfb57dc65860 /iptables
parenta7a6062f8ffe789703a6b4397c08dfb0c20a3009 (diff)
xtables-restore: Remove some pointless linebreaks
Due to reduced indenting level, some linebreaks are no longer needed. OTOH, strings should not be split to aid in grepping for error output. Signed-off-by: Phil Sutter <phil@nwl.cc> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables')
-rw-r--r--iptables/xtables-restore.c25
1 files changed, 10 insertions, 15 deletions
diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c
index d21e9730..83e05102 100644
--- a/iptables/xtables-restore.c
+++ b/iptables/xtables-restore.c
@@ -125,8 +125,7 @@ static void xtables_restore_parse_line(struct nft_handle *h,
return;
if (h->noflush == 0) {
- DEBUGP("Cleaning all chains of table '%s'\n",
- table);
+ DEBUGP("Cleaning all chains of table '%s'\n", table);
if (cb->table_flush)
cb->table_flush(h, table);
}
@@ -151,8 +150,7 @@ static void xtables_restore_parse_line(struct nft_handle *h,
if (strlen(chain) >= XT_EXTENSION_MAXNAMELEN)
xtables_error(PARAMETER_PROBLEM,
- "Invalid chain name `%s' "
- "(%u chars max)",
+ "Invalid chain name `%s' (%u chars max)",
chain, XT_EXTENSION_MAXNAMELEN - 1);
policy = strtok(NULL, " \t\n");
@@ -169,16 +167,15 @@ static void xtables_restore_parse_line(struct nft_handle *h,
if (!ctrs || !parse_counters(ctrs, &count))
xtables_error(PARAMETER_PROBLEM,
- "invalid policy counters "
- "for chain '%s'\n", chain);
+ "invalid policy counters for chain '%s'\n",
+ chain);
}
if (cb->chain_set &&
cb->chain_set(h, state->curtable->name,
chain, policy, &count) < 0) {
xtables_error(OTHER_PROBLEM,
- "Can't set policy `%s'"
- " on `%s' line %u: %s\n",
+ "Can't set policy `%s' on `%s' line %u: %s\n",
policy, chain, line,
strerror(errno));
}
@@ -187,15 +184,13 @@ static void xtables_restore_parse_line(struct nft_handle *h,
} else if (cb->chain_restore(h, chain, state->curtable->name) < 0 &&
errno != EEXIST) {
xtables_error(PARAMETER_PROBLEM,
- "cannot create chain "
- "'%s' (%s)\n", chain,
- strerror(errno));
+ "cannot create chain '%s' (%s)\n",
+ chain, strerror(errno));
} else if (h->family == NFPROTO_BRIDGE &&
!ebt_set_user_chain_policy(h, state->curtable->name,
chain, policy)) {
xtables_error(OTHER_PROBLEM,
- "Can't set policy `%s'"
- " on `%s' line %u: %s\n",
+ "Can't set policy `%s' on `%s' line %u: %s\n",
policy, chain, line,
strerror(errno));
}
@@ -232,8 +227,8 @@ static void xtables_restore_parse_line(struct nft_handle *h,
ret = 0;
if (ret < 0) {
- fprintf(stderr, "failed to abort "
- "commit operation\n");
+ fprintf(stderr,
+ "failed to abort commit operation\n");
}
exit(1);
}