From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MoxKL-00056s-HF for qemu-devel@nongnu.org; Sat, 19 Sep 2009 06:38:01 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MoxKF-0004xb-JT for qemu-devel@nongnu.org; Sat, 19 Sep 2009 06:38:00 -0400 Received: from [199.232.76.173] (port=46790 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MoxKF-0004uS-Cv for qemu-devel@nongnu.org; Sat, 19 Sep 2009 06:37:55 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:50493) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MoxKD-0004BZ-JZ for qemu-devel@nongnu.org; Sat, 19 Sep 2009 06:37:54 -0400 From: Stefan Weil Date: Sat, 19 Sep 2009 12:37:51 +0200 Message-Id: <1253356671-10088-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH] eepro100: Fix format strings in debug messages List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers size_t arguments need %zu instead of %d. This patch is a step to synchronize my maintainer version of eepro100.c (git://repo.or.cz/qemu/ar7.git) with the version integrated in QEMU. Signed-off-by: Stefan Weil --- hw/eepro100.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index f1a9310..3f84e26 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1496,25 +1496,25 @@ static ssize_t nic_receive(VLANClientState *vc, const uint8_t * buf, size_t size } else if (size < 64 && (s->configuration[7] & 1)) { /* Short frame and configuration byte 7/0 (discard short receive) set: * Short frame is discarded */ - logout("%p received short frame (%d byte)\n", s, size); + logout("%p received short frame (%zu byte)\n", s, size); s->statistics.rx_short_frame_errors++; //~ return -1; } else if ((size > MAX_ETH_FRAME_SIZE + 4) && !(s->configuration[18] & 8)) { /* Long frame and configuration byte 18/3 (long receive ok) not set: * Long frames are discarded. */ - logout("%p received long frame (%d byte), ignored\n", s, size); + logout("%p received long frame (%zu byte), ignored\n", s, size); return -1; } else if (memcmp(buf, s->macaddr, 6) == 0) { // !!! /* Frame matches individual address. */ /* TODO: check configuration byte 15/4 (ignore U/L). */ - TRACE(RXTX, logout("%p received frame for me, len=%d\n", s, size)); + TRACE(RXTX, logout("%p received frame for me, len=%zu\n", s, size)); } else if (memcmp(buf, broadcast_macaddr, 6) == 0) { /* Broadcast frame. */ - TRACE(RXTX, logout("%p received broadcast, len=%d\n", s, size)); + TRACE(RXTX, logout("%p received broadcast, len=%zu\n", s, size)); rfd_status |= 0x0002; } else if (buf[0] & 0x01) { // !!! /* Multicast frame. */ - TRACE(RXTX, logout("%p received multicast, len=%d\n", s, size)); + TRACE(RXTX, logout("%p received multicast, len=%zu\n", s, size)); /* TODO: check multicast all bit. */ assert(!(s->configuration[21] & BIT(3))); int mcast_idx = compute_mcast_idx(buf); @@ -1524,10 +1524,10 @@ static ssize_t nic_receive(VLANClientState *vc, const uint8_t * buf, size_t size rfd_status |= 0x0002; } else if (s->configuration[15] & 1) { /* Promiscuous: receive all. */ - TRACE(RXTX, logout("%p received frame in promiscuous mode, len=%d\n", s, size)); + TRACE(RXTX, logout("%p received frame in promiscuous mode, len=%zu\n", s, size)); rfd_status |= 0x0004; } else { - TRACE(RXTX, logout("%p received frame, ignored, len=%d,%s\n", s, size, + TRACE(RXTX, logout("%p received frame, ignored, len=%zu,%s\n", s, size, nic_dump(buf, size))); return size; } -- 1.5.6.5