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 <p...@nwl.cc>
---
iptables/xtables-restore.c | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c
index 1a3739b3350c8..e9cdf2093bfcb 100644
--- a/iptables/xtables-restore.c
+++ b/iptables/xtables-restore.c
@@ -135,8 +135,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);
}
@@ -161,8 +160,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");
@@ -179,16 +177,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, p->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,
ops->strerror(errno));
}
@@ -197,15 +194,13 @@ static void xtables_restore_parse_line(struct nft_handle
*h,
} else if (cb->chain_restore(h, chain, p->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, p->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,
ops->strerror(errno));
}
@@ -238,8 +233,7 @@ static void xtables_restore_parse_line(struct nft_handle *h,
for (a = 0; a < newargc; a++)
DEBUGP("argv[%u]: %s\n", a, newargv[a]);
- ret = cb->do_command(h, newargc, newargv,
- &newargv[2], true);
+ ret = cb->do_command(h, newargc, newargv, &newargv[2], true);
if (ret < 0) {
if (cb->abort)
ret = cb->abort(h);
@@ -247,8 +241,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);
}
--
2.23.0
