summaryrefslogtreecommitdiffstats
path: root/iptables/xtables-save.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2018-05-07 13:37:45 +0200
committerFlorian Westphal <fw@strlen.de>2018-05-07 13:39:20 +0200
commit838746e009fcc3928ac76b4c7a07f5615d7d503a (patch)
treee9b91ec12721689d2c8e5a649922b37d4ae93611 /iptables/xtables-save.c
parent2211679de2b4b828e7172cb8c392a80b9bf3108a (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/xtables-save.c')
-rw-r--r--iptables/xtables-save.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/iptables/xtables-save.c b/iptables/xtables-save.c
index 893b2b93..e5401daf 100644
--- a/iptables/xtables-save.c
+++ b/iptables/xtables-save.c
@@ -45,16 +45,16 @@ do_output(struct nft_handle *h, const char *tablename, bool counters)
struct nftnl_chain_list *chain_list;
if (!tablename)
- return nft_for_each_table(h, do_output, counters);
+ return nft_for_each_table(h, do_output, counters) ? 1 : 0;
if (!nft_table_find(h, tablename)) {
printf("Table `%s' does not exist\n", tablename);
- return 0;
+ return 1;
}
if (!nft_is_table_compatible(h, tablename)) {
printf("# Table `%s' is incompatible, use 'nft' tool.\n", tablename);
- return 1;
+ return 0;
}
chain_list = nft_chain_dump(h);
@@ -73,8 +73,7 @@ do_output(struct nft_handle *h, const char *tablename, bool counters)
now = time(NULL);
printf("COMMIT\n");
printf("# Completed on %s", ctime(&now));
-
- return 1;
+ return 0;
}
/* Format:
@@ -176,7 +175,7 @@ xtables_save_main(int family, const char *progname, int argc, char *argv[])
exit(0);
}
- return !do_output(&h, tablename, show_counters);
+ return do_output(&h, tablename, show_counters);
}
int xtables_ip4_save_main(int argc, char *argv[])