From 241e73594f6d75e32a7e89ebdb6b7f7917a48df0 Mon Sep 17 00:00:00 2001 From: Maciej Zenczykowski Date: Mon, 4 Apr 2011 15:34:54 +0200 Subject: v6: rename for_each_chain() to for_each_chain6() Signed-off-by: Maciej Zenczykowski Signed-off-by: Patrick McHardy --- include/ip6tables.h | 2 +- ip6tables-restore.c | 4 ++-- ip6tables.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/ip6tables.h b/include/ip6tables.h index ca0f9a05..e9a0f4ea 100644 --- a/include/ip6tables.h +++ b/include/ip6tables.h @@ -10,7 +10,7 @@ extern int do_command6(int argc, char *argv[], char **table, struct ip6tc_handle **handle); -extern int for_each_chain(int (*fn)(const ip6t_chainlabel, int, struct ip6tc_handle *), int verbose, int builtinstoo, struct ip6tc_handle *handle); +extern int for_each_chain6(int (*fn)(const ip6t_chainlabel, int, struct ip6tc_handle *), int verbose, int builtinstoo, struct ip6tc_handle *handle); extern int flush_entries(const ip6t_chainlabel chain, int verbose, struct ip6tc_handle *handle); extern int delete_chain(const ip6t_chainlabel chain, int verbose, struct ip6tc_handle *handle); void print_rule(const struct ip6t_entry *e, struct ip6tc_handle *h, const char *chain, int counters); diff --git a/ip6tables-restore.c b/ip6tables-restore.c index 48ff98ce..a4e37078 100644 --- a/ip6tables-restore.c +++ b/ip6tables-restore.c @@ -226,12 +226,12 @@ int 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_chain6(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_chain6(delete_chain, verbose, 0, handle); } diff --git a/ip6tables.c b/ip6tables.c index 96a0fdcf..67745863 100644 --- a/ip6tables.c +++ b/ip6tables.c @@ -859,7 +859,7 @@ check_entry(const ip6t_chainlabel chain, struct ip6t_entry *fw, } int -for_each_chain(int (*fn)(const ip6t_chainlabel, int, struct ip6tc_handle *), +for_each_chain6(int (*fn)(const ip6t_chainlabel, int, struct ip6tc_handle *), int verbose, int builtinstoo, struct ip6tc_handle *handle) { int ret = 1; @@ -899,7 +899,7 @@ flush_entries(const ip6t_chainlabel chain, int verbose, struct ip6tc_handle *handle) { if (!chain) - return for_each_chain(flush_entries, verbose, 1, handle); + return for_each_chain6(flush_entries, verbose, 1, handle); if (verbose) fprintf(stdout, "Flushing chain `%s'\n", chain); @@ -911,7 +911,7 @@ zero_entries(const ip6t_chainlabel chain, int verbose, struct ip6tc_handle *handle) { if (!chain) - return for_each_chain(zero_entries, verbose, 1, handle); + return for_each_chain6(zero_entries, verbose, 1, handle); if (verbose) fprintf(stdout, "Zeroing chain `%s'\n", chain); @@ -923,7 +923,7 @@ delete_chain(const ip6t_chainlabel chain, int verbose, struct ip6tc_handle *handle) { if (!chain) - return for_each_chain(delete_chain, verbose, 0, handle); + return for_each_chain6(delete_chain, verbose, 0, handle); if (verbose) fprintf(stdout, "Deleting chain `%s'\n", chain); -- cgit v1.2.3