From bb9fe8059f40f0dde9c780498f5af42f5aa6a179 Mon Sep 17 00:00:00 2001 From: Maciej Zenczykowski Date: Mon, 4 Apr 2011 15:37:13 +0200 Subject: v4: rename print_rule() to print_rule4() Signed-off-by: Maciej Zenczykowski Signed-off-by: Patrick McHardy --- include/iptables.h | 2 +- iptables-save.c | 2 +- iptables.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/iptables.h b/include/iptables.h index 4e9ae197..204c92ea 100644 --- a/include/iptables.h +++ b/include/iptables.h @@ -15,7 +15,7 @@ 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); -extern void print_rule(const struct ipt_entry *e, +extern void print_rule4(const struct ipt_entry *e, struct iptc_handle *handle, const char *chain, int counters); /* kernel revision handling */ diff --git a/iptables-save.c b/iptables-save.c index a0aa5d80..dee17528 100644 --- a/iptables-save.c +++ b/iptables-save.c @@ -107,7 +107,7 @@ static int do_output(const char *tablename) /* Dump out rules */ e = iptc_first_rule(chain, h); while(e) { - print_rule(e, h, chain, show_counters); + print_rule4(e, h, chain, show_counters); e = iptc_next_rule(e, h); } } diff --git a/iptables.c b/iptables.c index 5af832e5..b7c94981 100644 --- a/iptables.c +++ b/iptables.c @@ -1101,7 +1101,7 @@ static void print_ip(const char *prefix, uint32_t 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 ipt_entry *e, +void print_rule4(const struct ipt_entry *e, struct iptc_handle *h, const char *chain, int counters) { const struct ipt_entry_target *t; @@ -1224,7 +1224,7 @@ list_rules(const ipt_chainlabel chain, int rulenum, int counters, while(e) { num++; if (!rulenum || num == rulenum) - print_rule(e, handle, this, counters); + print_rule4(e, handle, this, counters); e = iptc_next_rule(e, handle); } found = 1; -- cgit v1.2.3