v4: rename for_each_chain() to for_each_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 84211c32f87be3c74727442757f7977e2da0498b..76cc8d6737aee03d69ebf329880cf52309f9d907 100644 (file)
--- a/include/iptables.h
+++ b/include/iptables.h
@@ -13,7 +13,7 @@ extern int delete_chain(const ipt_chainlabel chain, int verbose,
                        struct iptc_handle *handle);
 extern int flush_entries(const ipt_chainlabel chain, int verbose, 
                        struct iptc_handle *handle);
-extern int for_each_chain(int (*fn)(const ipt_chainlabel, int, struct iptc_handle *),
+extern int for_each_chain4(int (*fn)(const ipt_chainlabel, int, struct iptc_handle *),
                int verbose, int builtinstoo, struct iptc_handle *handle);
 extern void print_rule(const struct ipt_entry *e,
                struct iptc_handle *handle, const char *chain, int counters);

diff --git a/iptables-restore.c b/iptables-restore.c
index 34a81563e425c445e959b7f08996e0fddc9b43bc..d3b7124628bc07384c714988d1e5f6ae33e0b019 100644 (file)
--- a/iptables-restore.c
+++ b/iptables-restore.c
@@ -233,12 +233,12 @@ main(int argc, char *argv[])
                        if (noflush == 0) {
                                DEBUGP("Cleaning all chains of table '%s'\n",
                                        table);
-                               for_each_chain(flush_entries, verbose, 1,
+                               for_each_chain4(flush_entries, verbose, 1,
                                                handle);
 
                                DEBUGP("Deleting all user-defined chains "
                                       "of table '%s'\n", table);
-                               for_each_chain(delete_chain, verbose, 0,
+                               for_each_chain4(delete_chain, verbose, 0,
                                                handle);
                        }
 

diff --git a/iptables.c b/iptables.c
index cff4a7b3d41d09eb1584dde61c34fe341c215f76..b7cedd20364ab2fb80f6fed5f7f706c2d6c52ed1 100644 (file)
--- a/iptables.c
+++ b/iptables.c
@@ -862,7 +862,7 @@ check_entry(const ipt_chainlabel chain, struct ipt_entry *fw,
 }
 
 int
-for_each_chain(int (*fn)(const ipt_chainlabel, int, struct iptc_handle *),
+for_each_chain4(int (*fn)(const ipt_chainlabel, int, struct iptc_handle *),
               int verbose, int builtinstoo, struct iptc_handle *handle)
 {
         int ret = 1;
@@ -902,7 +902,7 @@ flush_entries(const ipt_chainlabel chain, int verbose,
              struct iptc_handle *handle)
 {
        if (!chain)
-               return for_each_chain(flush_entries, verbose, 1, handle);
+               return for_each_chain4(flush_entries, verbose, 1, handle);
 
        if (verbose)
                fprintf(stdout, "Flushing chain `%s'\n", chain);
@@ -914,7 +914,7 @@ zero_entries(const ipt_chainlabel chain, int verbose,
             struct iptc_handle *handle)
 {
        if (!chain)
-               return for_each_chain(zero_entries, verbose, 1, handle);
+               return for_each_chain4(zero_entries, verbose, 1, handle);
 
        if (verbose)
                fprintf(stdout, "Zeroing chain `%s'\n", chain);
@@ -926,7 +926,7 @@ delete_chain(const ipt_chainlabel chain, int verbose,
             struct iptc_handle *handle)
 {
        if (!chain)
-               return for_each_chain(delete_chain, verbose, 0, handle);
+               return for_each_chain4(delete_chain, verbose, 0, handle);
 
        if (verbose)
                fprintf(stdout, "Deleting chain `%s'\n", chain);