From 8d7e96f625c4a58d721db413b032fd0bb5671b96 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Wed, 18 Dec 2013 15:25:14 +0000 Subject: [PATCH] qemu-traditional: Fix build warnings on Wheezy MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit CC i386-dm/eepro100.o hw/eepro100.c: In function ‘eepro100_read4’: hw/eepro100.c:1232:5: warning: ‘val’ may be used uninitialized in this function [-Wmaybe-uninitialized] hw/eepro100.c: In function ‘eepro100_read2’: hw/eepro100.c:1202:5: warning: ‘val’ may be used uninitialized in this function [-Wmaybe-uninitialized] hw/eepro100.c: In function ‘eepro100_read1’: hw/eepro100.c:1179:5: warning: ‘val’ may be used uninitialized in this function [-Wmaybe-uninitialized] Use ~0 to match the behaviour of real hardware. Signed-off-by: Andrew Cooper CC: Ian Campbell Acked-by: Ian Jackson (cherry picked from commit 7f5b3c338e0f8938ba575dec18255dcbee0c2ee2) (cherry picked from commit 044c9e608e67defea4fc9c9ef4286e85a99d68c2) --- hw/eepro100.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index bc6c3d5a9..d172b91d5 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1136,7 +1136,7 @@ static void eepro100_write_port(EEPRO100State * s, uint32_t val) static uint8_t eepro100_read1(EEPRO100State * s, uint32_t addr) { - uint8_t val; + uint8_t val = ~0; if (addr <= sizeof(s->mem) - sizeof(val)) { memcpy(&val, &s->mem[addr], sizeof(val)); } @@ -1181,7 +1181,7 @@ static uint8_t eepro100_read1(EEPRO100State * s, uint32_t addr) static uint16_t eepro100_read2(EEPRO100State * s, uint32_t addr) { - uint16_t val; + uint16_t val = ~0; if (addr <= sizeof(s->mem) - sizeof(val)) { memcpy(&val, &s->mem[addr], sizeof(val)); } @@ -1204,7 +1204,7 @@ static uint16_t eepro100_read2(EEPRO100State * s, uint32_t addr) static uint32_t eepro100_read4(EEPRO100State * s, uint32_t addr) { - uint32_t val; + uint32_t val = ~0U; if (addr <= sizeof(s->mem) - sizeof(val)) { memcpy(&val, &s->mem[addr], sizeof(val)); } -- 2.39.5