From 93329ab6971c431d8be14f78e1b51910abafcdd1 Mon Sep 17 00:00:00 2001 From: Lephe Date: Tue, 6 Aug 2024 19:02:43 +0200 Subject: [PATCH] fix new GCC 14 warnings --- src/gdb/gdb.c | 2 +- src/kmalloc/arena_gint.c | 6 +++--- src/usb/pipes.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gdb/gdb.c b/src/gdb/gdb.c index e5aa661..1fbfe20 100644 --- a/src/gdb/gdb.c +++ b/src/gdb/gdb.c @@ -629,7 +629,7 @@ static bool gdb_handle_stubcall(gdb_cpu_state_t* cpu_state) int sc_num = cpu_state->reg.r3; if(sc_num == 64) { /* write */ - int len = snprintf(str, sizeof str, "Fwrite,%x,%08x,%x", + int len = snprintf(str, sizeof str, "Fwrite,%lx,%08lx,%lx", cpu_state->reg.r4, cpu_state->reg.r5, cpu_state->reg.r6); diff --git a/src/kmalloc/arena_gint.c b/src/kmalloc/arena_gint.c index b042fd6..b28b013 100644 --- a/src/kmalloc/arena_gint.c +++ b/src/kmalloc/arena_gint.c @@ -247,7 +247,7 @@ static void prepend_link(block_t *b, index_t *index) //--- /* Round a size to the closest allocatable size */ -static size_t round(size_t size) +static size_t round_size(size_t size) { return (size < 8) ? 8 : ((size + 3) & ~3); } @@ -256,7 +256,7 @@ static void *gint_malloc(size_t size, void *data) { index_t *index = data; stats_t *s = index->stats; - size = round(size); + size = round_size(size); int c = size_class(size); /* Try to find a class that has a free block available */ @@ -330,7 +330,7 @@ static void *gint_realloc(void *ptr, size_t size, void *data) index_t *index = data; stats_t *s = index->stats; block_t *b = ptr - sizeof(block_t); - size = round(size); + size = round_size(size); int size_before = b->size; /* When requesting a smaller size, split the original block */ diff --git a/src/usb/pipes.c b/src/usb/pipes.c index 99ce8d3..f881e4c 100644 --- a/src/usb/pipes.c +++ b/src/usb/pipes.c @@ -539,7 +539,7 @@ static void USB_LOG_TR(char const *p, asyncio_op_t *t, char const *fmt, ...) if(t->shbuf_size >= 4) sprintf(shbuf, "!!%d", t->shbuf_size); else - snprintf(shbuf, t->shbuf_size * 2 + 1, "%08x", t->shbuf); + snprintf(shbuf, t->shbuf_size * 2 + 1, "%08lx", t->shbuf); char str[128]; snprintf(str, sizeof str - 1, "%s: %s buf=%d%s%s req=%d/%d%s |%s| ",