v4: rename delete_chain() to delete_chain4()

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

diff --git a/include/iptables.h b/include/iptables.h
index a2ed9d6d569df87c2288054537f396b1e89d9772..4e9ae1974a73ac9cf535a05082d8c7a332cf7050 100644 (file)
--- a/include/iptables.h
+++ b/include/iptables.h
@@ -9,7 +9,7 @@
 /* Your shared library should call one of these. */
 extern int do_command(int argc, char *argv[], char **table,
                      struct iptc_handle **handle);
-extern int delete_chain(const ipt_chainlabel chain, int verbose,
+extern int delete_chain4(const ipt_chainlabel chain, int verbose,
                        struct iptc_handle *handle);
 extern int flush_entries4(const ipt_chainlabel chain, int verbose, 
                        struct iptc_handle *handle);

diff --git a/iptables-restore.c b/iptables-restore.c
index 1bdce8a81e13f080d2ee75070d01763b60768cfd..6163a92566fe512605b7bb27f410bd27ca7e47a0 100644 (file)
--- a/iptables-restore.c
+++ b/iptables-restore.c
@@ -238,7 +238,7 @@ main(int argc, char *argv[])
 
                                DEBUGP("Deleting all user-defined chains "
                                       "of table '%s'\n", table);
-                               for_each_chain4(delete_chain, verbose, 0,
+                               for_each_chain4(delete_chain4, verbose, 0,
                                                handle);
                        }
 

diff --git a/iptables.c b/iptables.c
index 3987b672fd31fdb677642f9c4e98f18c215909d0..5af832e5bbc4c2eb7209ead7b8172c21bb6dcf5d 100644 (file)
--- a/iptables.c
+++ b/iptables.c
@@ -922,11 +922,11 @@ zero_entries(const ipt_chainlabel chain, int verbose,
 }
 
 int
-delete_chain(const ipt_chainlabel chain, int verbose,
+delete_chain4(const ipt_chainlabel chain, int verbose,
             struct iptc_handle *handle)
 {
        if (!chain)
-               return for_each_chain4(delete_chain, verbose, 0, handle);
+               return for_each_chain4(delete_chain4, verbose, 0, handle);
 
        if (verbose)
                fprintf(stdout, "Deleting chain `%s'\n", chain);
@@ -2016,7 +2016,7 @@ int do_command(int argc, char *argv[], char **table, struct iptc_handle **handle
                ret = iptc_create_chain(chain, *handle);
                break;
        case CMD_DELETE_CHAIN:
-               ret = delete_chain(chain, cs.options&OPT_VERBOSE, *handle);
+               ret = delete_chain4(chain, cs.options&OPT_VERBOSE, *handle);
                break;
        case CMD_RENAME_CHAIN:
                ret = iptc_rename_chain(chain, newname, *handle);