From adb20edec60a28e79ad68bdb744b5be5aaf1a695 Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net" Date: Sun, 6 Apr 2008 15:43:13 +0000 Subject: [PATCH 05/24] Fix -Wshadow warnings and clean up xt_sctp.h Note: xt_sctp.h is still not merged upstream in the kernel as of this commit. But a refactoring was really needed. --- ip6tables-save.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ip6tables-save.c') diff --git a/ip6tables-save.c b/ip6tables-save.c index fe57cfd..c73d354 100644 --- a/ip6tables-save.c +++ b/ip6tables-save.c @@ -21,7 +21,7 @@ #include #endif -static int binary = 0, counters = 0; +static int show_binary = 0, show_counters = 0; static struct option options[] = { { "binary", 0, 0, 'b' }, @@ -264,7 +264,7 @@ static int do_output(const char *tablename) exit_error(OTHER_PROBLEM, "Can't initialize: %s\n", ip6tc_strerror(errno)); - if (!binary) { + if (!show_binary) { time_t now = time(NULL); printf("# Generated by ip6tables-save v%s on %s", @@ -297,7 +297,7 @@ static int do_output(const char *tablename) /* Dump out rules */ e = ip6tc_first_rule(chain, &h); while(e) { - print_rule(e, &h, chain, counters); + print_rule(e, &h, chain, show_counters); e = ip6tc_next_rule(e, &h); } } @@ -342,11 +342,11 @@ int main(int argc, char *argv[]) while ((c = getopt_long(argc, argv, "bcdt:", options, NULL)) != -1) { switch (c) { case 'b': - binary = 1; + show_binary = 1; break; case 'c': - counters = 1; + show_counters = 1; break; case 't': -- cgit v1.2.3