From e70844a98d125679cfe0c62e48d0f19bf175280d Mon Sep 17 00:00:00 2001 From: Maciej Zenczykowski Date: Mon, 4 Apr 2011 15:34:28 +0200 Subject: v4: rename for_each_chain() to for_each_chain4() Signed-off-by: Maciej Zenczykowski Signed-off-by: Patrick McHardy --- include/iptables.h | 2 +- iptables-restore.c | 4 ++-- iptables.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/iptables.h b/include/iptables.h index 84211c32..76cc8d67 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -13,7 +13,7 @@ extern int delete_chain(const ipt_chainlabel chain, int verbose, struct iptc_handle *handle); extern int flush_entries(const ipt_chainlabel chain, int verbose, struct iptc_handle *handle); -extern int for_each_chain(int (*fn)(const ipt_chainlabel, int, struct iptc_handle *), +extern int for_each_chain4(int (*fn)(const ipt_chainlabel, int, struct iptc_handle *), int verbose, int builtinstoo, struct iptc_handle *handle); extern void print_rule(const struct ipt_entry *e, struct iptc_handle *handle, const char *chain, int counters); diff --git a/iptables-restore.c b/iptables-restore.c index 34a81563..d3b71246 100644 --- a/iptables-restore.c +++ b/iptables-restore.c @@ -233,12 +233,12 @@ main(int argc, char *argv[]) if (noflush == 0) { DEBUGP("Cleaning all chains of table '%s'\n", table); - for_each_chain(flush_entries, verbose, 1, + for_each_chain4(flush_entries, verbose, 1, handle); DEBUGP("Deleting all user-defined chains " "of table '%s'\n", table); - for_each_chain(delete_chain, verbose, 0, + for_each_chain4(delete_chain, verbose, 0, handle); } diff --git a/iptables.c b/iptables.c index cff4a7b3..b7cedd20 100644 --- a/iptables.c +++ b/iptables.c @@ -862,7 +862,7 @@ check_entry(const ipt_chainlabel chain, struct ipt_entry *fw, } int -for_each_chain(int (*fn)(const ipt_chainlabel, int, struct iptc_handle *), +for_each_chain4(int (*fn)(const ipt_chainlabel, int, struct iptc_handle *), int verbose, int builtinstoo, struct iptc_handle *handle) { int ret = 1; @@ -902,7 +902,7 @@ flush_entries(const ipt_chainlabel chain, int verbose, struct iptc_handle *handle) { if (!chain) - return for_each_chain(flush_entries, verbose, 1, handle); + return for_each_chain4(flush_entries, verbose, 1, handle); if (verbose) fprintf(stdout, "Flushing chain `%s'\n", chain); @@ -914,7 +914,7 @@ zero_entries(const ipt_chainlabel chain, int verbose, struct iptc_handle *handle) { if (!chain) - return for_each_chain(zero_entries, verbose, 1, handle); + return for_each_chain4(zero_entries, verbose, 1, handle); if (verbose) fprintf(stdout, "Zeroing chain `%s'\n", chain); @@ -926,7 +926,7 @@ delete_chain(const ipt_chainlabel chain, int verbose, struct iptc_handle *handle) { if (!chain) - return for_each_chain(delete_chain, verbose, 0, handle); + return for_each_chain4(delete_chain, verbose, 0, handle); if (verbose) fprintf(stdout, "Deleting chain `%s'\n", chain); -- cgit v1.2.3