[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 10/27] hw/dma/pl330: Use qemu_hexdump_line to avoid sprintf
|
From: |
Richard Henderson |
|
Subject: |
[PATCH v3 10/27] hw/dma/pl330: Use qemu_hexdump_line to avoid sprintf |
|
Date: |
Fri, 12 Apr 2024 00:33:29 -0700 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1.
Using qemu_hexdump_line both fixes the deprecation warning and
simplifies the code base.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/dma/pl330.c | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index 70a502d245..5f89295af3 100644
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -15,6 +15,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/cutils.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
@@ -317,22 +318,14 @@ typedef struct PL330InsnDesc {
static void pl330_hexdump(uint8_t *buf, size_t size)
{
- unsigned int b, i, len;
- char tmpbuf[80];
+ g_autoptr(GString) str = g_string_sized_new(64);
+ size_t b, len;
- for (b = 0; b < size; b += 16) {
- len = size - b;
- if (len > 16) {
- len = 16;
- }
- tmpbuf[0] = '\0';
- for (i = 0; i < len; i++) {
- if ((i % 4) == 0) {
- strcat(tmpbuf, " ");
- }
- sprintf(tmpbuf + strlen(tmpbuf), " %02x", buf[b + i]);
- }
- trace_pl330_hexdump(b, tmpbuf);
+ for (b = 0; b < size; b += len) {
+ len = MIN(16, size - b);
+ g_string_truncate(str, 0);
+ qemu_hexdump_line(str, buf + b, len, 1, 4);
+ trace_pl330_hexdump(b, str->str);
}
}
--
2.34.1
- Re: [PATCH v3 03/27] util/hexdump: Use a GString for qemu_hexdump_line, (continued)
[PATCH v3 02/27] util/hexdump: Remove ascii parameter from qemu_hexdump_line, Richard Henderson, 2024/04/12
[PATCH v3 04/27] util/hexdump: Add unit_len and block_len to qemu_hexdump_line, Richard Henderson, 2024/04/12
[PATCH v3 06/27] hw/mips/malta: Add re-usable rng_seed_hex_new() method, Richard Henderson, 2024/04/12
[PATCH v3 07/27] system/qtest: Replace sprintf by qemu_hexdump_line, Richard Henderson, 2024/04/12
[PATCH v3 09/27] hw/ide/atapi: Use qemu_hexdump_line to avoid sprintf, Richard Henderson, 2024/04/12
[PATCH v3 10/27] hw/dma/pl330: Use qemu_hexdump_line to avoid sprintf,
Richard Henderson <=
[PATCH v3 08/27] hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprintf, Richard Henderson, 2024/04/12
[PATCH v3 12/27] disas/m68k: Replace sprintf() by snprintf(), Richard Henderson, 2024/04/12
[PATCH v3 13/27] disas/microblaze: Replace sprintf() by snprintf(), Richard Henderson, 2024/04/12
[PATCH v3 15/27] target/microblaze: Re-indent print_insn_microblaze, Richard Henderson, 2024/04/12
[PATCH v3 14/27] disas/microblaze: Split out print_immval_addr, Richard Henderson, 2024/04/12
[PATCH v3 16/27] disas/microblaze: Merge op->name output into each fprintf, Richard Henderson, 2024/04/12
[PATCH v3 11/27] backends/tpm: Use qemu_hexdump_line to avoid sprintf, Richard Henderson, 2024/04/12
[PATCH v3 05/27] util/hexdump: Inline g_string_append_printf "%02x", Richard Henderson, 2024/04/12