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>

diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c
index df8844208c273e30dcb3589fef92ee84cb93c467..eb5eaa29bb0e84aa3c9921c88b4c08cc2b329757 100644 (file)
--- 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) {