From 9a594d0a607d80afe891783b003a948b16caa873 Mon Sep 17 00:00:00 2001 From: Franck LeCodeur Date: Sat, 16 Oct 2021 19:31:17 +0200 Subject: [PATCH] bus_managers/firewire: Fix warnings Add parenthesis for macro processing, change variable type for signedness comparison warning Change-Id: I67125ac1dfc97583ecb9e5706909a0a09cda7a2e Reviewed-on: https://review.haiku-os.org/c/haiku/+/4575 Reviewed-by: Adrien Destugues --- src/add-ons/kernel/bus_managers/firewire/firewire.cpp | 4 ++-- src/bin/fwcontrol/fwcrom.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/firewire/firewire.cpp b/src/add-ons/kernel/bus_managers/firewire/firewire.cpp index 59e7492c04..118fb529d9 100644 --- a/src/add-ons/kernel/bus_managers/firewire/firewire.cpp +++ b/src/add-ons/kernel/bus_managers/firewire/firewire.cpp @@ -1107,7 +1107,7 @@ fw_tl2xfer(struct firewire_comm *fc, int node, int tlabel, int tcode) if((uint)xfer->send.hdr.mode.hdr.dst == (uint)node) { mtx_unlock(&fc->tlabel_lock); splx(s); - KASSERT(xfer->tl == tlabel, + KASSERT((xfer->tl == tlabel), ("xfer->tl 0x%x != 0x%x", xfer->tl, tlabel)); /* extra sanity check */ req = xfer->send.hdr.mode.hdr.tcode; @@ -2102,7 +2102,7 @@ fw_rcv(struct fw_rcv_buf *rb) if(bind == NULL){ device_printf(rb->fc->bdev, "%s: " "Unknown service addr 0x%04x:0x%08x %s(%x)" - " src=0x%x data=%u\n", + " src=0x%x data=%" B_PRIu32 "\n", __func__, fp->mode.wreqq.dest_hi, fp->mode.wreqq.dest_lo, diff --git a/src/bin/fwcontrol/fwcrom.c b/src/bin/fwcontrol/fwcrom.c index 70bac5c521..4267876ff5 100644 --- a/src/bin/fwcontrol/fwcrom.c +++ b/src/bin/fwcontrol/fwcrom.c @@ -465,15 +465,15 @@ crom_add_simple_text(struct crom_src *src, struct crom_chunk *parent, { struct csrtext *tl; uint32_t *p; - int len, i; + size_t len, i; char t[MAX_TEXT]; len = strlen(buf); if (len > MAX_TEXT) { #if defined(__DragonFly__) || __FreeBSD_version < 500000 - printf("text(%d) truncated to %zd.\n", len, MAX_TEXT); + printf("text(%zu) truncated to %zu.\n", len, MAX_TEXT); #else - printf("text(%d) truncated to %zd.\n", len, MAX_TEXT); + printf("text(%zu) truncated to %zu.\n", len, MAX_TEXT); #endif len = MAX_TEXT; }