openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

eepro100: Fix format strings in debug messages 

size_t arguments need %zu instead of %d.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Stefan Weil 2009-09-19 12:37:51 +02:00 committed by Aurelien Jarno
parent 41cbc23c5c
commit 067d01de29
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/eepro100.c
View File

@ -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)) { } else if (size < 64 && (s->configuration[7] & 1)) {
/* Short frame and configuration byte 7/0 (discard short receive) set: /* Short frame and configuration byte 7/0 (discard short receive) set:
* Short frame is discarded */ * 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++; s->statistics.rx_short_frame_errors++;
//~ return -1; //~ return -1;
} else if ((size > MAX_ETH_FRAME_SIZE + 4) && !(s->configuration[18] & 8)) { } 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 frame and configuration byte 18/3 (long receive ok) not set:
* Long frames are discarded. */ * 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; return -1;
} else if (memcmp(buf, s->macaddr, 6) == 0) { // !!! } else if (memcmp(buf, s->macaddr, 6) == 0) { // !!!
/* Frame matches individual address. */ /* Frame matches individual address. */
/* TODO: check configuration byte 15/4 (ignore U/L). */ /* 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) { } else if (memcmp(buf, broadcast_macaddr, 6) == 0) {
/* Broadcast frame. */ /* 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; rfd_status |= 0x0002;
} else if (buf[0] & 0x01) { // !!! } else if (buf[0] & 0x01) { // !!!
/* Multicast frame. */ /* 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. */ /* TODO: check multicast all bit. */
assert(!(s->configuration[21] & BIT(3))); assert(!(s->configuration[21] & BIT(3)));
int mcast_idx = compute_mcast_idx(buf); 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; rfd_status |= 0x0002;
} else if (s->configuration[15] & 1) { } else if (s->configuration[15] & 1) {
/* Promiscuous: receive all. */ /* 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; rfd_status |= 0x0004;
} else { } 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))); nic_dump(buf, size)));
return size; return size;
} }