v4: rename flush_entries() to flush_entries4()

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 76cc8d6737aee03d69ebf329880cf52309f9d907..a2ed9d6d569df87c2288054537f396b1e89d9772 100644 (file)
--- 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 d3b7124628bc07384c714988d1e5f6ae33e0b019..1bdce8a81e13f080d2ee75070d01763b60768cfd 100644 (file)
--- 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 b7cedd20364ab2fb80f6fed5f7f706c2d6c52ed1..3987b672fd31fdb677642f9c4e98f18c215909d0 100644 (file)
--- 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);