diff options
author | Florian Westphal <fw@strlen.de> | 2018-05-07 13:37:45 +0200 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2018-05-07 13:39:20 +0200 |
commit | 838746e009fcc3928ac76b4c7a07f5615d7d503a (patch) | |
tree | e9b91ec12721689d2c8e5a649922b37d4ae93611 /iptables/nft.c | |
parent | 2211679de2b4b828e7172cb8c392a80b9bf3108a (diff) |
xtables-compat: xtables-save: don't return 1
noticed that iptables-compat-save exits with 1 on success,
whereas iptables-compat-save -t filter returns 0 (as expected).
Caused by double-invert of return value, so ge rid of those.
do_output now returns a value suitable to pass to exit() or return from main.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'iptables/nft.c')
-rw-r--r-- | iptables/nft.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/iptables/nft.c b/iptables/nft.c index 165fb9cf..fcceb09c 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -1630,20 +1630,17 @@ int nft_for_each_table(struct nft_handle *h, int (*func)(struct nft_handle *h, const char *tablename, bool counters), bool counters) { - int ret = 1; struct nftnl_table_list *list; struct nftnl_table_list_iter *iter; struct nftnl_table *t; list = nftnl_table_list_get(h); - if (list == NULL) { - ret = 0; - goto err; - } + if (list == NULL) + return -1; iter = nftnl_table_list_iter_create(list); if (iter == NULL) - return 0; + return -1; t = nftnl_table_list_iter_next(iter); while (t != NULL) { @@ -1656,10 +1653,7 @@ int nft_for_each_table(struct nft_handle *h, } nftnl_table_list_free(list); - -err: - /* the core expects 1 for success and 0 for error */ - return ret == 0 ? 1 : 0; + return 0; } static int __nft_rule_del(struct nft_handle *h, struct nftnl_rule_list *list, |