diff options
author | Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de> | 2010-01-12 15:36:24 +0000 |
---|---|---|
committer | Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de> | 2010-01-12 15:36:24 +0000 |
commit | fb47cb30a1ac587125f0237ae3c75a7026e5cceb (patch) | |
tree | 0de6c940c2288444810f571fabe0687c7e1ba40a /cbtable.c | |
parent | e266058278c4e5d53fd85e949eaeaeda7ef0812a (diff) | |
download | flashrom-fb47cb30a1ac587125f0237ae3c75a7026e5cceb.zip flashrom-fb47cb30a1ac587125f0237ae3c75a7026e5cceb.tar.gz |
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>
Diffstat (limited to 'cbtable.c')
-rw-r--r-- | cbtable.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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) \ |