From cc38d058d14e84d3008a0c0035348e0ad5f0d5d2 Mon Sep 17 00:00:00 2001 From: Maciej Zenczykowski Date: Mon, 4 Apr 2011 15:35:20 +0200 Subject: v4: rename flush_entries() to flush_entries4() Signed-off-by: Maciej Zenczykowski Signed-off-by: Patrick McHardy --- include/iptables.h | 2 +- iptables-restore.c | 2 +- iptables.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/iptables.h b/include/iptables.h index 76cc8d67..a2ed9d6d 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -11,7 +11,7 @@ extern int do_command(int argc, char *argv[], char **table, struct iptc_handle **handle); extern int delete_chain(const ipt_chainlabel chain, int verbose, struct iptc_handle *handle); -extern int flush_entries(const ipt_chainlabel chain, int verbose, +extern int flush_entries4(const ipt_chainlabel chain, int verbose, struct iptc_handle *handle); extern int for_each_chain4(int (*fn)(const ipt_chainlabel, int, struct iptc_handle *), int verbose, int builtinstoo, struct iptc_handle *handle); diff --git a/iptables-restore.c b/iptables-restore.c index d3b71246..1bdce8a8 100644 --- a/iptables-restore.c +++ b/iptables-restore.c @@ -233,7 +233,7 @@ main(int argc, char *argv[]) if (noflush == 0) { DEBUGP("Cleaning all chains of table '%s'\n", table); - for_each_chain4(flush_entries, verbose, 1, + for_each_chain4(flush_entries4, verbose, 1, handle); DEBUGP("Deleting all user-defined chains " diff --git a/iptables.c b/iptables.c index b7cedd20..3987b672 100644 --- a/iptables.c +++ b/iptables.c @@ -898,11 +898,11 @@ for_each_chain4(int (*fn)(const ipt_chainlabel, int, struct iptc_handle *), } int -flush_entries(const ipt_chainlabel chain, int verbose, +flush_entries4(const ipt_chainlabel chain, int verbose, struct iptc_handle *handle) { if (!chain) - return for_each_chain4(flush_entries, verbose, 1, handle); + return for_each_chain4(flush_entries4, verbose, 1, handle); if (verbose) fprintf(stdout, "Flushing chain `%s'\n", chain); @@ -1975,7 +1975,7 @@ int do_command(int argc, char *argv[], char **table, struct iptc_handle **handle *handle); break; case CMD_FLUSH: - ret = flush_entries(chain, cs.options&OPT_VERBOSE, *handle); + ret = flush_entries4(chain, cs.options&OPT_VERBOSE, *handle); break; case CMD_ZERO: ret = zero_entries(chain, cs.options&OPT_VERBOSE, *handle); -- cgit v1.2.3