Enable -Wshadow, clean code for that

This is not just for fun. We hit a real bug on BSD with the outl macros.
The macro variable tmp collided with the tmp from outer scope.

second revision, now also taking care of inb/inw/inl. While that shadowing
did not introduce bugs (yet), of course it breaks the build on BSD when
-Wshadow is enabled.

Corresponding to flashrom svn r860.

Signed-off-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Acked-by: Luc Verhaegen <libv@skynet.be>

1 files changed, 4 insertions, 4 deletions

diff --git a/cbtable.c b/cbtable.c
index 2bc1bfa..2611a62 100644
--- a/cbtable.c
+++ b/cbtable.c
@@ -50,7 +50,7 @@ static unsigned long compute_checksum(void *addr, unsigned long length)
 	volatile union {
 		uint8_t byte[2];
 		uint16_t word;
-	} value;
+	} chksum;
 	unsigned long sum;
 	unsigned long i;
 
@@ -72,10 +72,10 @@ static unsigned long compute_checksum(void *addr, unsigned long length)
 			sum = (sum + (sum >> 16)) & 0xFFFF;
 		}
 	}
-	value.byte[0] = sum & 0xff;
-	value.byte[1] = (sum >> 8) & 0xff;
+	chksum.byte[0] = sum & 0xff;
+	chksum.byte[1] = (sum >> 8) & 0xff;
 
-	return (~value.word) & 0xFFFF;
+	return (~chksum.word) & 0xFFFF;
 }
 
 #define for_each_lbrec(head, rec) \