From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NmZpJ-0004dP-0S for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:40:25 -0500 Received: from [199.232.76.173] (port=37836 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NmZpI-0004d6-Gb for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:40:24 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NmZpH-0004xt-0U for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:40:24 -0500 Received: from moutng.kundenserver.de ([212.227.126.187]:65470) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NmZpG-0004xn-E2 for qemu-devel@nongnu.org; Tue, 02 Mar 2010 16:40:22 -0500 From: Stefan Weil Date: Tue, 2 Mar 2010 22:37:52 +0100 Message-Id: <1267565880-18382-12-git-send-email-weil@mail.berlios.de> In-Reply-To: <4B7821AC.6080400@mail.berlios.de> References: <4B7821AC.6080400@mail.berlios.de> Subject: [Qemu-devel] [PATCHv3 12/20] eepro100: Replace variable name to fix a compiler warning List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Cc: mst@redhat.com When compiling with -Wshadow, gcc gives a warning which is fixed by renaming stat -> status. Signed-off-by: Stefan Weil --- hw/eepro100.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index 2a871b8..7eaa876 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -392,14 +392,14 @@ static void eepro100_acknowledge(EEPRO100State * s) } } -static void eepro100_interrupt(EEPRO100State * s, uint8_t stat) +static void eepro100_interrupt(EEPRO100State * s, uint8_t status) { uint8_t mask = ~s->mem[SCBIntmask]; - s->mem[SCBAck] |= stat; - stat = s->scb_stat = s->mem[SCBAck]; - stat &= (mask | 0x0f); - //~ stat &= (~s->mem[SCBIntmask] | 0x0xf); - if (stat && (mask & 0x01)) { + s->mem[SCBAck] |= status; + status = s->scb_stat = s->mem[SCBAck]; + status &= (mask | 0x0f); + //~ status &= (~s->mem[SCBIntmask] | 0x0xf); + if (status && (mask & 0x01)) { /* SCB mask and SCB Bit M do not disable interrupt. */ enable_interrupt(s); } else if (s->int_stat) { -- 1.7.0