diff options
| author | Phil Sutter <phil@nwl.cc> | 2019-09-17 17:53:31 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2019-09-25 23:46:14 +0200 |
| commit | b19d239323dd9f732b24ad6c95101cf7a51c4b20 (patch) | |
| tree | 9c335bdce9d382cd4599ad082624a80d31e44499 /iptables/xtables-restore.c | |
| parent | 7c64eaf4b1b97ff69a7d9c5c13d4e9eff97d2cd1 (diff) | |
xtables_error() does not return
It's a define which resolves into a callback which in turn is declared
with noreturn attribute. It will never return, therefore drop all
explicit exit() calls or other dead code immediately following it.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'iptables/xtables-restore.c')
| -rw-r--r-- | iptables/xtables-restore.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c index f930f5ba..27e65b97 100644 --- a/iptables/xtables-restore.c +++ b/iptables/xtables-restore.c @@ -131,12 +131,11 @@ void xtables_restore_parse(struct nft_handle *h, table = strtok(buffer+1, " \t\n"); DEBUGP("line %u, table '%s'\n", line, table); - if (!table) { + if (!table) xtables_error(PARAMETER_PROBLEM, "%s: line %u table name invalid\n", xt_params->program_name, line); - exit(1); - } + curtable = nft_table_builtin_find(h, table); if (!curtable) xtables_error(PARAMETER_PROBLEM, @@ -168,12 +167,10 @@ void xtables_restore_parse(struct nft_handle *h, chain = strtok(buffer+1, " \t\n"); DEBUGP("line %u, chain '%s'\n", line, chain); - if (!chain) { + if (!chain) xtables_error(PARAMETER_PROBLEM, "%s: line %u chain name invalid\n", xt_params->program_name, line); - exit(1); - } if (strlen(chain) >= XT_EXTENSION_MAXNAMELEN) xtables_error(PARAMETER_PROBLEM, @@ -183,12 +180,10 @@ void xtables_restore_parse(struct nft_handle *h, policy = strtok(NULL, " \t\n"); DEBUGP("line %u, policy '%s'\n", line, policy); - if (!policy) { + if (!policy) xtables_error(PARAMETER_PROBLEM, "%s: line %u policy invalid\n", xt_params->program_name, line); - exit(1); - } if (nft_chain_builtin_find(curtable, chain)) { if (counters) { |