v6: rename flush_entries() to flush_entries6()

Signed-off-by: Maciej Zenczykowski <maze@google.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/include/ip6tables.h b/include/ip6tables.h
index e9a0f4eaa30d9fa5f1b2685380be3acc60b157b8..672faed2098f4863f9dd9b376079a425271218f6 100644 (file)
--- 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 a4e3707825583569b2151a93b6a2c81e8eb4f139..3b50a54d3f2f3e1507f932acb2247c6f128e21b2 100644 (file)
--- 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 67745863991259fdd31a5288860054158b8f1d83..abcf0ca35da876ce9fc4b6ff3976c04965661e5a 100644 (file)
--- 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);