v6: rename delete_chain() to delete_chain6()

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 672faed2098f4863f9dd9b376079a425271218f6..48633b72f28a5d6eba41d0d6dcaeb6c4814051df 100644 (file)
--- a/include/ip6tables.h
+++ b/include/ip6tables.h
@@ -12,7 +12,7 @@ extern int do_command6(int argc, char *argv[], char **table,
 
 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_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);
+extern int delete_chain6(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);
 
 extern struct xtables_globals ip6tables_globals;

diff --git a/ip6tables-restore.c b/ip6tables-restore.c
index 3b50a54d3f2f3e1507f932acb2247c6f128e21b2..5531d6e32eb4b5aa6e435e0581a3c76927a5e303 100644 (file)
--- a/ip6tables-restore.c
+++ b/ip6tables-restore.c
@@ -231,7 +231,7 @@ int main(int argc, char *argv[])
 
                                DEBUGP("Deleting all user-defined chains "
                                       "of table '%s'\n", table);
-                               for_each_chain6(delete_chain, verbose, 0,
+                               for_each_chain6(delete_chain6, verbose, 0,
                                                handle);
                        }
 

diff --git a/ip6tables.c b/ip6tables.c
index abcf0ca35da876ce9fc4b6ff3976c04965661e5a..a8ea55157c3b386b6ce566c2d11a1942a8cca1cc 100644 (file)
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -919,11 +919,11 @@ zero_entries(const ip6t_chainlabel chain, int verbose,
 }
 
 int
-delete_chain(const ip6t_chainlabel chain, int verbose,
+delete_chain6(const ip6t_chainlabel chain, int verbose,
             struct ip6tc_handle *handle)
 {
        if (!chain)
-               return for_each_chain6(delete_chain, verbose, 0, handle);
+               return for_each_chain6(delete_chain6, verbose, 0, handle);
 
        if (verbose)
                fprintf(stdout, "Deleting chain `%s'\n", chain);
@@ -1978,7 +1978,7 @@ int do_command6(int argc, char *argv[], char **table, struct ip6tc_handle **hand
                ret = ip6tc_create_chain(chain, *handle);
                break;
        case CMD_DELETE_CHAIN:
-               ret = delete_chain(chain, cs.options&OPT_VERBOSE, *handle);
+               ret = delete_chain6(chain, cs.options&OPT_VERBOSE, *handle);
                break;
        case CMD_RENAME_CHAIN:
                ret = ip6tc_rename_chain(chain, newname,        *handle);