v6: rename print_rule() to print_rule6()

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 48633b72f28a5d6eba41d0d6dcaeb6c4814051df..e976361f0023f43da3ffd077811314d4ae117a2b 100644 (file)
--- a/include/ip6tables.h
+++ b/include/ip6tables.h
@@ -13,7 +13,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_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);
+void print_rule6(const struct ip6t_entry *e, struct ip6tc_handle *h, const char *chain, int counters);
 
 extern struct xtables_globals ip6tables_globals;
 

diff --git a/ip6tables-save.c b/ip6tables-save.c
index 1a5e3c8c68933d3e69d78e74649b9a7248c58691..d9ecc62deec324b886ef8cd95180ed1053c8b95b 100644 (file)
--- a/ip6tables-save.c
+++ b/ip6tables-save.c
@@ -109,7 +109,7 @@ static int do_output(const char *tablename)
                        /* Dump out rules */
                        e = ip6tc_first_rule(chain, h);
                        while(e) {
-                               print_rule(e, h, chain, show_counters);
+                               print_rule6(e, h, chain, show_counters);
                                e = ip6tc_next_rule(e, h);
                        }
                }

diff --git a/ip6tables.c b/ip6tables.c
index a8ea55157c3b386b6ce566c2d11a1942a8cca1cc..83d8aed2507a1d40da681d8011c00d091af716ed 100644 (file)
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -1083,7 +1083,7 @@ static void print_ip(const char *prefix, const struct in6_addr *ip,
 
 /* We want this to be readable, so only print out neccessary fields.
  * Because that's the kind of world I want to live in.  */
-void print_rule(const struct ip6t_entry *e,
+void print_rule6(const struct ip6t_entry *e,
                       struct ip6tc_handle *h, const char *chain, int counters)
 {
        const struct ip6t_entry_target *t;
@@ -1215,7 +1215,7 @@ list_rules(const ip6t_chainlabel chain, int rulenum, int counters,
                while(e) {
                        num++;
                        if (!rulenum || num == rulenum)
-                           print_rule(e, handle, this, counters);
+                           print_rule6(e, handle, this, counters);
                        e = ip6tc_next_rule(e, handle);
                }
                found = 1;