diff options
| author | Phil Sutter <phil@nwl.cc> | 2019-10-18 00:03:00 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2019-10-18 11:57:46 +0200 |
| commit | 20994ab18d11331ce146b75fde04b93414db9afb (patch) | |
| tree | 6a9480c174a778d622c1348edb7567a50e7be23c | |
| parent | f88bc3d228428b8a7eeb5c6cba7e714fbfa1c2ad (diff) | |
xtables-restore: Drop local xtc_ops instance
It is merely used to hold nft_strerror() pointer but using that function
in turn does not provide any benefit as it falls back to plain
strerror() if nft_fn is not initialized.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | iptables/xtables-restore.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c index df884420..eb5eaa29 100644 --- a/iptables/xtables-restore.c +++ b/iptables/xtables-restore.c @@ -81,10 +81,6 @@ static const struct nft_xt_restore_cb restore_cb = { .chain_restore = nft_chain_restore, }; -static const struct xtc_ops xtc_ops = { - .strerror = nft_strerror, -}; - void xtables_restore_parse(struct nft_handle *h, const struct nft_xt_restore_parse *p, const struct nft_xt_restore_cb *cb) @@ -92,7 +88,6 @@ void xtables_restore_parse(struct nft_handle *h, const struct builtin_table *curtable = NULL; char buffer[10240]; int in_table = 0; - const struct xtc_ops *ops = &xtc_ops; line = 0; @@ -206,7 +201,7 @@ void xtables_restore_parse(struct nft_handle *h, "Can't set policy `%s'" " on `%s' line %u: %s\n", policy, chain, line, - ops->strerror(errno)); + strerror(errno)); } DEBUGP("Setting policy of chain %s to %s\n", chain, policy); @@ -223,7 +218,7 @@ void xtables_restore_parse(struct nft_handle *h, "Can't set policy `%s'" " on `%s' line %u: %s\n", policy, chain, line, - ops->strerror(errno)); + strerror(errno)); } ret = 1; } else if (in_table) { |