diff options
author | Phil Sutter <phil@nwl.cc> | 2022-01-07 16:26:30 +0100 |
---|---|---|
committer | Phil Sutter <phil@nwl.cc> | 2022-11-15 17:02:09 +0100 |
commit | 66b4a68de2212f3f872dc1b0e36aa8e76c70659d (patch) | |
tree | ae210c9f9b89ed1d747d63b547e8f683d4bc83d5 /iptables | |
parent | be8c6056040848b019e76e8b578598b35bae2655 (diff) |
Drop extra newline from xtables_error() calls
Since basic_exit_err() appends a newline to the message itself, drop
explicit ones.
While being at it, fix indentation and join texts split over multiple
lines.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables')
-rw-r--r-- | iptables/ip6tables.c | 4 | ||||
-rw-r--r-- | iptables/iptables-restore.c | 38 | ||||
-rw-r--r-- | iptables/iptables-save.c | 5 | ||||
-rw-r--r-- | iptables/iptables-xml.c | 16 | ||||
-rw-r--r-- | iptables/iptables.c | 4 | ||||
-rw-r--r-- | iptables/nft-cache.c | 3 | ||||
-rw-r--r-- | iptables/nft.c | 2 | ||||
-rw-r--r-- | iptables/xshared.c | 30 | ||||
-rw-r--r-- | iptables/xtables-eb-translate.c | 2 | ||||
-rw-r--r-- | iptables/xtables-eb.c | 2 | ||||
-rw-r--r-- | iptables/xtables-restore.c | 26 |
11 files changed, 64 insertions, 68 deletions
diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c index ae267035..062b2b15 100644 --- a/iptables/ip6tables.c +++ b/iptables/ip6tables.c @@ -766,8 +766,8 @@ int do_command6(int argc, char *argv[], char **table, #ifdef IP6T_F_GOTO if (cs.fw6.ipv6.flags & IP6T_F_GOTO) xtables_error(PARAMETER_PROBLEM, - "goto '%s' is not a chain\n", - cs.jumpto); + "goto '%s' is not a chain", + cs.jumpto); #endif xtables_find_target(cs.jumpto, XTF_LOAD_MUST_SUCCEED); } else { diff --git a/iptables/iptables-restore.c b/iptables/iptables-restore.c index 4410a587..05661bf6 100644 --- a/iptables/iptables-restore.c +++ b/iptables/iptables-restore.c @@ -78,8 +78,9 @@ create_handle(const struct iptables_restore_cb *cb, const char *tablename) } if (!handle) - xtables_error(PARAMETER_PROBLEM, "%s: unable to initialize " - "table '%s'\n", xt_params->program_name, tablename); + xtables_error(PARAMETER_PROBLEM, + "%s: unable to initialize table '%s'", + xt_params->program_name, tablename); return handle; } @@ -209,8 +210,8 @@ ip46tables_restore_main(const struct iptables_restore_cb *cb, DEBUGP("line %u, table '%s'\n", line, table); if (!table) xtables_error(PARAMETER_PROBLEM, - "%s: line %u table name invalid\n", - xt_params->program_name, line); + "%s: line %u table name invalid", + xt_params->program_name, line); strncpy(curtable, table, XT_TABLE_MAXNAMELEN); curtable[XT_TABLE_MAXNAMELEN] = '\0'; @@ -249,8 +250,8 @@ ip46tables_restore_main(const struct iptables_restore_cb *cb, DEBUGP("line %u, chain '%s'\n", line, chain); if (!chain) xtables_error(PARAMETER_PROBLEM, - "%s: line %u chain name invalid\n", - xt_params->program_name, line); + "%s: line %u chain name invalid", + xt_params->program_name, line); if (strlen(chain) >= XT_EXTENSION_MAXNAMELEN) xtables_error(PARAMETER_PROBLEM, @@ -263,16 +264,14 @@ ip46tables_restore_main(const struct iptables_restore_cb *cb, DEBUGP("Flushing existing user defined chain '%s'\n", chain); if (!cb->ops->flush_entries(chain, handle)) xtables_error(PARAMETER_PROBLEM, - "error flushing chain " - "'%s':%s\n", chain, - strerror(errno)); + "error flushing chain '%s':%s", + chain, strerror(errno)); } else { DEBUGP("Creating new chain '%s'\n", chain); if (!cb->ops->create_chain(chain, handle)) xtables_error(PARAMETER_PROBLEM, - "error creating chain " - "'%s':%s\n", chain, - strerror(errno)); + "error creating chain '%s':%s", + chain, strerror(errno)); } } @@ -280,8 +279,8 @@ ip46tables_restore_main(const struct iptables_restore_cb *cb, DEBUGP("line %u, policy '%s'\n", line, policy); if (!policy) xtables_error(PARAMETER_PROBLEM, - "%s: line %u policy invalid\n", - xt_params->program_name, line); + "%s: line %u policy invalid", + xt_params->program_name, line); if (strcmp(policy, "-") != 0) { struct xt_counters count = {}; @@ -292,8 +291,8 @@ ip46tables_restore_main(const struct iptables_restore_cb *cb, if (!ctrs || !parse_counters(ctrs, &count)) xtables_error(PARAMETER_PROBLEM, - "invalid policy counters " - "for chain '%s'\n", chain); + "invalid policy counters for chain '%s'", + chain); } DEBUGP("Setting policy of chain %s to %s\n", @@ -302,10 +301,9 @@ ip46tables_restore_main(const struct iptables_restore_cb *cb, if (!cb->ops->set_policy(chain, policy, &count, handle)) xtables_error(OTHER_PROBLEM, - "Can't set policy `%s'" - " on `%s' line %u: %s\n", - policy, chain, line, - cb->ops->strerror(errno)); + "Can't set policy `%s' on `%s' line %u: %s", + policy, chain, line, + cb->ops->strerror(errno)); } xtables_announce_chain(chain); diff --git a/iptables/iptables-save.c b/iptables/iptables-save.c index a8dded63..094adf22 100644 --- a/iptables/iptables-save.c +++ b/iptables/iptables-save.c @@ -61,8 +61,7 @@ for_each_table(int (*func)(struct iptables_save_cb *cb, const char *tablename), while (fgets(tablename, sizeof(tablename), procfile)) { if (tablename[strlen(tablename) - 1] != '\n') xtables_error(OTHER_PROBLEM, - "Badly formed tablename `%s'\n", - tablename); + "Badly formed tablename `%s'", tablename); tablename[strlen(tablename) - 1] = '\0'; ret &= func(cb, tablename); } @@ -85,7 +84,7 @@ static int do_output(struct iptables_save_cb *cb, const char *tablename) h = cb->ops->init(tablename); } if (!h) - xtables_error(OTHER_PROBLEM, "Cannot initialize: %s\n", + xtables_error(OTHER_PROBLEM, "Cannot initialize: %s", cb->ops->strerror(errno)); time_t now = time(NULL); diff --git a/iptables/iptables-xml.c b/iptables/iptables-xml.c index 6cf059fb..d28cf748 100644 --- a/iptables/iptables-xml.c +++ b/iptables/iptables-xml.c @@ -210,8 +210,8 @@ saveChain(char *chain, char *policy, struct xt_counters *ctr) { if (nextChain >= maxChains) xtables_error(PARAMETER_PROBLEM, - "%s: line %u chain name invalid\n", - prog_name, line); + "%s: line %u chain name invalid", + prog_name, line); chains[nextChain].chain = xtables_strdup(chain); chains[nextChain].policy = xtables_strdup(policy); @@ -610,8 +610,8 @@ iptables_xml_main(int argc, char *argv[]) DEBUGP("line %u, table '%s'\n", line, table); if (!table) xtables_error(PARAMETER_PROBLEM, - "%s: line %u table name invalid\n", - prog_name, line); + "%s: line %u table name invalid", + prog_name, line); openTable(table); @@ -626,8 +626,8 @@ iptables_xml_main(int argc, char *argv[]) DEBUGP("line %u, chain '%s'\n", line, chain); if (!chain) xtables_error(PARAMETER_PROBLEM, - "%s: line %u chain name invalid\n", - prog_name, line); + "%s: line %u chain name invalid", + prog_name, line); DEBUGP("Creating new chain '%s'\n", chain); @@ -635,8 +635,8 @@ iptables_xml_main(int argc, char *argv[]) DEBUGP("line %u, policy '%s'\n", line, policy); if (!policy) xtables_error(PARAMETER_PROBLEM, - "%s: line %u policy invalid\n", - prog_name, line); + "%s: line %u policy invalid", + prog_name, line); ctrs = strtok(NULL, " \t\n"); parse_counters(ctrs, &count); diff --git a/iptables/iptables.c b/iptables/iptables.c index 591ec178..0351b39f 100644 --- a/iptables/iptables.c +++ b/iptables/iptables.c @@ -761,8 +761,8 @@ int do_command4(int argc, char *argv[], char **table, #ifdef IPT_F_GOTO if (cs.fw.ip.flags & IPT_F_GOTO) xtables_error(PARAMETER_PROBLEM, - "goto '%s' is not a chain\n", - cs.jumpto); + "goto '%s' is not a chain", + cs.jumpto); #endif xtables_find_target(cs.jumpto, XTF_LOAD_MUST_SUCCEED); } else { diff --git a/iptables/nft-cache.c b/iptables/nft-cache.c index 608e42a7..2403508c 100644 --- a/iptables/nft-cache.c +++ b/iptables/nft-cache.c @@ -105,7 +105,8 @@ static void mnl_genid_get(struct nft_handle *h, uint32_t *genid) return; xtables_error(RESOURCE_PROBLEM, - "Could not fetch rule set generation id: %s\n", nft_strerror(errno)); + "Could not fetch rule set generation id: %s", + nft_strerror(errno)); } static int nftnl_table_list_cb(const struct nlmsghdr *nlh, void *data) diff --git a/iptables/nft.c b/iptables/nft.c index 09cb19c9..b65da371 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -3857,6 +3857,6 @@ void nft_assert_table_compatible(struct nft_handle *h, chain = ""; } xtables_error(OTHER_PROBLEM, - "%s%s%stable `%s' is incompatible, use 'nft' tool.\n", + "%s%s%stable `%s' is incompatible, use 'nft' tool.", pfx, chain, sfx, table); } diff --git a/iptables/xshared.c b/iptables/xshared.c index 0beacee6..d400dc59 100644 --- a/iptables/xshared.c +++ b/iptables/xshared.c @@ -400,15 +400,15 @@ bool tokenize_rule_counters(char **bufferp, char **pcntp, char **bcntp, int line ptr = strchr(buffer, ']'); if (!ptr) - xtables_error(PARAMETER_PROBLEM, "Bad line %u: need ]\n", line); + xtables_error(PARAMETER_PROBLEM, "Bad line %u: need ]", line); pcnt = strtok(buffer+1, ":"); if (!pcnt) - xtables_error(PARAMETER_PROBLEM, "Bad line %u: need :\n", line); + xtables_error(PARAMETER_PROBLEM, "Bad line %u: need :", line); bcnt = strtok(NULL, "]"); if (!bcnt) - xtables_error(PARAMETER_PROBLEM, "Bad line %u: need ]\n", line); + xtables_error(PARAMETER_PROBLEM, "Bad line %u: need ]", line); *pcntp = pcnt; *bcntp = bcnt; @@ -433,10 +433,10 @@ void add_argv(struct argv_store *store, const char *what, int quoted) if (store->argc + 1 >= MAX_ARGC) xtables_error(PARAMETER_PROBLEM, - "Parser cannot handle more arguments\n"); + "Parser cannot handle more arguments"); if (!what) xtables_error(PARAMETER_PROBLEM, - "Trying to store NULL argument\n"); + "Trying to store NULL argument"); store->argv[store->argc] = xtables_strdup(what); store->argvattr[store->argc] = quoted; @@ -900,8 +900,7 @@ static char cmd2char(int option) ; if (i >= ARRAY_SIZE(cmdflags)) xtables_error(OTHER_PROBLEM, - "cmd2char(): Invalid command number %u.\n", - 1 << i); + "cmd2char(): Invalid command number %u.", 1 << i); return cmdflags[i]; } @@ -911,8 +910,8 @@ static void add_command(unsigned int *cmd, const int newcmd, if (invert) xtables_error(PARAMETER_PROBLEM, "unexpected '!' flag"); if (*cmd & (~othercmds)) - xtables_error(PARAMETER_PROBLEM, "Cannot use -%c with -%c\n", - cmd2char(newcmd), cmd2char(*cmd & (~othercmds))); + xtables_error(PARAMETER_PROBLEM, "Cannot use -%c with -%c", + cmd2char(newcmd), cmd2char(*cmd & (~othercmds))); *cmd |= newcmd; } @@ -979,9 +978,8 @@ static void generic_opt_check(int command, int options) if (!(options & (1<<i))) { if (commands_v_options[j][i] == '+') xtables_error(PARAMETER_PROBLEM, - "You need to supply the `-%c' " - "option for this command\n", - optflags[i]); + "You need to supply the `-%c' option for this command", + optflags[i]); } else { if (commands_v_options[j][i] != 'x') legal = 1; @@ -991,8 +989,8 @@ static void generic_opt_check(int command, int options) } if (legal == -1) xtables_error(PARAMETER_PROBLEM, - "Illegal option `-%c' with this command\n", - optflags[i]); + "Illegal option `-%c' with this command", + optflags[i]); } } @@ -1060,12 +1058,12 @@ void assert_valid_chain_name(const char *chainname) if (*chainname == '-' || *chainname == '!') xtables_error(PARAMETER_PROBLEM, - "chain name not allowed to start with `%c'\n", + "chain name not allowed to start with `%c'", *chainname); if (xtables_find_target(chainname, XTF_TRY_LOAD)) xtables_error(PARAMETER_PROBLEM, - "chain name may not clash with target name\n"); + "chain name may not clash with target name"); for (ptr = chainname; *ptr; ptr++) if (isspace(*ptr)) diff --git a/iptables/xtables-eb-translate.c b/iptables/xtables-eb-translate.c index 86177024..f09883cd 100644 --- a/iptables/xtables-eb-translate.c +++ b/iptables/xtables-eb-translate.c @@ -294,7 +294,7 @@ print_zero: "Multiple commands are not allowed"); if (exec_style == EXEC_STYLE_DAEMON) xtables_error(PARAMETER_PROBLEM, - "%s %s\n", prog_name, prog_vers); + "%s %s", prog_name, prog_vers); printf("%s %s\n", prog_name, prog_vers); exit(0); case 'h': diff --git a/iptables/xtables-eb.c b/iptables/xtables-eb.c index 631a3ceb..c5fc3385 100644 --- a/iptables/xtables-eb.c +++ b/iptables/xtables-eb.c @@ -883,7 +883,7 @@ print_zero: case 't': /* Table */ if (restore && table_set) xtables_error(PARAMETER_PROBLEM, - "The -t option cannot be used in %s.\n", + "The -t option cannot be used in %s.", xt_params->program_name); else if (table_set) xtables_error(PARAMETER_PROBLEM, diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c index c9d4ffbf..abe56374 100644 --- a/iptables/xtables-restore.c +++ b/iptables/xtables-restore.c @@ -115,14 +115,14 @@ static void xtables_restore_parse_line(struct nft_handle *h, DEBUGP("line %u, table '%s'\n", line, table); if (!table) xtables_error(PARAMETER_PROBLEM, - "%s: line %u table name invalid\n", - xt_params->program_name, line); + "%s: line %u table name invalid", + xt_params->program_name, line); state->curtable = nft_table_builtin_find(h, table); if (!state->curtable) xtables_error(PARAMETER_PROBLEM, - "%s: line %u table name '%s' invalid\n", - xt_params->program_name, line, table); + "%s: line %u table name '%s' invalid", + xt_params->program_name, line, table); if (p->tablename && (strcmp(p->tablename, table) != 0)) return; @@ -152,8 +152,8 @@ static void xtables_restore_parse_line(struct nft_handle *h, DEBUGP("line %u, chain '%s'\n", line, chain); if (!chain) xtables_error(PARAMETER_PROBLEM, - "%s: line %u chain name invalid\n", - xt_params->program_name, line); + "%s: line %u chain name invalid", + xt_params->program_name, line); xtables_announce_chain(chain); assert_valid_chain_name(chain); @@ -162,8 +162,8 @@ static void xtables_restore_parse_line(struct nft_handle *h, DEBUGP("line %u, policy '%s'\n", line, policy); if (!policy) xtables_error(PARAMETER_PROBLEM, - "%s: line %u policy invalid\n", - xt_params->program_name, line); + "%s: line %u policy invalid", + xt_params->program_name, line); if (nft_chain_builtin_find(state->curtable, chain)) { if (counters) { @@ -172,15 +172,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'", + 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", policy, chain, line, strerror(errno)); } @@ -189,13 +189,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", + "cannot create chain '%s' (%s)", chain, strerror(errno)); } else if (h->family == NFPROTO_BRIDGE && !ebt_cmd_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", policy, chain, line, strerror(errno)); } |