From dbb77543ad6afe29e9a1881b2d4fc212de621a55 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 11 Feb 2008 00:33:30 +0100 Subject: 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. --- extensions/libipt_SAME.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'extensions/libipt_SAME.c') diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c index d1e6903a..f7c737c5 100644 --- a/extensions/libipt_SAME.c +++ b/extensions/libipt_SAME.c @@ -149,7 +149,7 @@ static void SAME_print(const void *ip, const struct xt_entry_target *target, unsigned int count; struct ipt_same_info *mr = (struct ipt_same_info *)target->data; - int random = 0; + int random_selection = 0; printf("same:"); @@ -167,13 +167,13 @@ static void SAME_print(const void *ip, const struct xt_entry_target *target, else printf("-%s ", ipaddr_to_numeric(&a)); if (r->flags & IP_NAT_RANGE_PROTO_RANDOM) - random = 1; + random_selection = 1; } if (mr->info & IPT_SAME_NODST) printf("nodst "); - if (random) + if (random_selection) printf("random "); } @@ -183,7 +183,7 @@ static void SAME_save(const void *ip, const struct xt_entry_target *target) unsigned int count; struct ipt_same_info *mr = (struct ipt_same_info *)target->data; - int random = 0; + int random_selection = 0; for (count = 0; count < mr->rangesize; count++) { struct ip_nat_range *r = &mr->range[count]; @@ -198,13 +198,13 @@ static void SAME_save(const void *ip, const struct xt_entry_target *target) else printf("-%s ", ipaddr_to_numeric(&a)); if (r->flags & IP_NAT_RANGE_PROTO_RANDOM) - random = 1; + random_selection = 1; } if (mr->info & IPT_SAME_NODST) printf("--nodst "); - if (random) + if (random_selection) printf("--random "); } -- cgit v1.2.3