summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej Zenczykowski <maze@google.com>2011-04-04 15:35:47 +0200
committerPatrick McHardy <kaber@trash.net>2011-04-04 15:35:47 +0200
commit74ace0a46048d01611a44c24f6fe5f59d936231b (patch)
treef593d4d589f5e6ec9f452c2455e91c0dc54ec56a
parentcc38d058d14e84d3008a0c0035348e0ad5f0d5d2 (diff)
v6: rename flush_entries() to flush_entries6()
Signed-off-by: Maciej Zenczykowski <maze@google.com> Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r--include/ip6tables.h2
-rw-r--r--ip6tables-restore.c2
-rw-r--r--ip6tables.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/include/ip6tables.h b/include/ip6tables.h
index e9a0f4ea..672faed2 100644
--- a/include/ip6tables.h
+++ b/include/ip6tables.h
@@ -11,7 +11,7 @@ extern int do_command6(int argc, char *argv[], char **table,
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 flush_entries6(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 a4e37078..3b50a54d 100644
--- a/ip6tables-restore.c
+++ b/ip6tables-restore.c
@@ -226,7 +226,7 @@ int main(int argc, char *argv[])
if (noflush == 0) {
DEBUGP("Cleaning all chains of table '%s'\n",
table);
- for_each_chain6(flush_entries, verbose, 1,
+ for_each_chain6(flush_entries6, verbose, 1,
handle);
DEBUGP("Deleting all user-defined chains "
diff --git a/ip6tables.c b/ip6tables.c
index 67745863..abcf0ca3 100644
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -895,11 +895,11 @@ for_each_chain6(int (*fn)(const ip6t_chainlabel, int, struct ip6tc_handle *),
}
int
-flush_entries(const ip6t_chainlabel chain, int verbose,
+flush_entries6(const ip6t_chainlabel chain, int verbose,
struct ip6tc_handle *handle)
{
if (!chain)
- return for_each_chain6(flush_entries, verbose, 1, handle);
+ return for_each_chain6(flush_entries6, verbose, 1, handle);
if (verbose)
fprintf(stdout, "Flushing chain `%s'\n", chain);
@@ -1937,7 +1937,7 @@ int do_command6(int argc, char *argv[], char **table, struct ip6tc_handle **hand
*handle);
break;
case CMD_FLUSH:
- ret = flush_entries(chain, cs.options&OPT_VERBOSE, *handle);
+ ret = flush_entries6(chain, cs.options&OPT_VERBOSE, *handle);
break;
case CMD_ZERO:
ret = zero_entries(chain, cs.options&OPT_VERBOSE, *handle);