|
From: <co...@us...> - 2024-12-31 10:45:55
|
Revision: 45442
http://sourceforge.net/p/vice-emu/code/45442
Author: compyx
Date: 2024-12-31 10:45:52 +0000 (Tue, 31 Dec 2024)
Log Message:
-----------
Fix -Wformat warnings
Fix (s)printf() format string warnings found by clang 19. There are likely
more to be found when enabling the DBG() macros in individual files.
Modified Paths:
--------------
trunk/vice/src/core/tpicore.c
trunk/vice/src/monitor/mon_disassemble.c
trunk/vice/src/parallel/parallel-trap.c
trunk/vice/src/serial/fsdrive.c
trunk/vice/src/sha1.c
trunk/vice/src/vdc/vdc-mem.c
Modified: trunk/vice/src/core/tpicore.c
===================================================================
--- trunk/vice/src/core/tpicore.c 2024-12-31 10:41:51 UTC (rev 45441)
+++ trunk/vice/src/core/tpicore.c 2024-12-31 10:45:52 UTC (rev 45442)
@@ -93,8 +93,7 @@
if (mytpi_debug) {
log_message(tpi_context->log,
"pop_irq_state(latches=%02x, stack=%02x, active=%02x)",
- (int)irq_latches, (int)(tpi_context->irq_stack),
- (int)irq_active);
+ irq_latches, tpi_context->irq_stack, irq_active);
}
if (irq_priority) {
if (tpi_context->irq_stack) {
@@ -120,8 +119,7 @@
if (mytpi_debug) {
log_message(tpi_context->log,
"push_irq_state(latches=%02x, act=%02x, stack=%02x mask=%02x).",
- (int)irq_latches, (int)irq_active,
- (int)(tpi_context->irq_stack), (int)irq_mask);
+ irq_latches, irq_active, tpi_context->irq_stack, irq_mask);
}
irq_latches &= ~irq_active;
Modified: trunk/vice/src/monitor/mon_disassemble.c
===================================================================
--- trunk/vice/src/monitor/mon_disassemble.c 2024-12-31 10:41:51 UTC (rev 45441)
+++ trunk/vice/src/monitor/mon_disassemble.c 2024-12-31 10:45:52 UTC (rev 45442)
@@ -145,23 +145,28 @@
switch (opc_size) {
case 1:
- sprintf(buff, "%02X %s%s", x,
+ sprintf(buff, "%02X %s%s",
+ x,
is_undoc ? "*" : "", string);
break;
case 2:
- sprintf(buff, "%02X %02X %s%s", x, p1 & 0xff,
+ sprintf(buff, "%02X %02X %s%s",
+ x, (unsigned int)p1 & 0xff,
is_undoc ? "*" : "", string);
break;
case 3:
- sprintf(buff, "%02X %02X %02X %s%s", x, p1 & 0xff, p2 & 0xff,
+ sprintf(buff, "%02X %02X %02X %s%s",
+ x, (unsigned int)p1 & 0xff, (unsigned int)p2 & 0xff,
is_undoc ? "*" : "", string);
break;
case 4:
- sprintf(buff, "%02X %02X %02X %02X %s%s", x, p1 & 0xff, p2 & 0xff, p3 & 0xff,
+ sprintf(buff, "%02X %02X %02X %02X %s%s",
+ x, (unsigned int)p1 & 0xff, (unsigned int)p2 & 0xff, (unsigned int)p3 & 0xff,
is_undoc ? "*" : "", string);
break;
case 5:
- sprintf(buff, "%02X%02X%02X %02X%02X %s%s", x, p1 & 0xff, p2 & 0xff, p3 & 0xff, p4 & 0xFF,
+ sprintf(buff, "%02X%02X%02X %02X%02X %s%s",
+ x, (unsigned int)p1 & 0xff, (unsigned int)p2 & 0xff, (unsigned int)p3 & 0xff, (unsigned int)p4 & 0xff,
is_undoc ? "*" : "", string);
break;
default:
@@ -356,7 +361,11 @@
break;
case ASM_ADDR_MODE_MOVE:
- sprintf(buffp, (hex_mode ? " $%02X,$%02X" : " %3d,%3u"), p2 & 0xff, ival);
+ if (hex_mode) {
+ sprintf(buffp, " $%02X,$%02X", (unsigned int)p2 & 0xff, ival);
+ } else {
+ sprintf(buffp, " %3d,%3u", p2 & 0xff, ival);
+ }
break;
case ASM_ADDR_MODE_RELATIVE:
Modified: trunk/vice/src/parallel/parallel-trap.c
===================================================================
--- trunk/vice/src/parallel/parallel-trap.c 2024-12-31 10:41:51 UTC (rev 45441)
+++ trunk/vice/src/parallel/parallel-trap.c 2024-12-31 10:45:52 UTC (rev 45442)
@@ -171,7 +171,7 @@
}
break;
default:
- log_error(parallel_log, "Unknown command %02X.", TrapSecondary & 0xff);
+ log_error(parallel_log, "Unknown command %02X.", (unsigned int)(TrapSecondary & 0xff));
}
return st;
}
@@ -374,7 +374,7 @@
"ok=%s, st=%04x.",
(unsigned int)secadr,
p->lastbyte[secadr],
- (int)*data,
+ (unsigned int)*data,
p->lastok[secadr] ? "ok" : "no",
(unsigned int)(p->lastst[secadr]),
p->nextbyte[secadr],
Modified: trunk/vice/src/serial/fsdrive.c
===================================================================
--- trunk/vice/src/serial/fsdrive.c 2024-12-31 10:41:51 UTC (rev 45441)
+++ trunk/vice/src/serial/fsdrive.c 2024-12-31 10:45:52 UTC (rev 45442)
@@ -184,7 +184,7 @@
break;
default:
- log_error(fsdrive_log, "Unknown command %02X.", secondary & 0xff);
+ log_error(fsdrive_log, "Unknown command %02X.", (unsigned int)(secondary & 0xff));
}
return st;
Modified: trunk/vice/src/sha1.c
===================================================================
--- trunk/vice/src/sha1.c 2024-12-31 10:41:51 UTC (rev 45441)
+++ trunk/vice/src/sha1.c 2024-12-31 10:45:52 UTC (rev 45442)
@@ -313,6 +313,6 @@
/* format the hash for comparison */
for(offset = 0; offset < 20; offset++) {
- sprintf(hash_string_out + (2 * offset), "%02x", result[offset] & 0xff);
+ sprintf(hash_string_out + (2 * offset), "%02x", (unsigned int)result[offset] & 0xff);
}
}
Modified: trunk/vice/src/vdc/vdc-mem.c
===================================================================
--- trunk/vice/src/vdc/vdc-mem.c 2024-12-31 10:41:51 UTC (rev 45441)
+++ trunk/vice/src/vdc/vdc-mem.c 2024-12-31 10:45:52 UTC (rev 45442)
@@ -678,7 +678,7 @@
mon_out("%02x: ", regnum);
for (c = 0; c < 16; c++) {
if (regnum <= 37) {
- mon_out("%02x ", vdc.regs[regnum] | regmask[regnum]);
+ mon_out("%02x ", (unsigned int)(vdc.regs[regnum] | regmask[regnum]));
}
regnum++;
if ((c & 3) == 3) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|