[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 09/27] hw/ide/atapi: Use qemu_hexdump_line to avoid sprintf
|
From: |
Richard Henderson |
|
Subject: |
[PATCH v3 09/27] hw/ide/atapi: Use qemu_hexdump_line to avoid sprintf |
|
Date: |
Fri, 12 Apr 2024 00:33:28 -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/ide/atapi.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 73ec373184..fcb6cca157 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -24,6 +24,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/cutils.h"
#include "hw/scsi/scsi.h"
#include "sysemu/block-backend.h"
#include "scsi/constants.h"
@@ -1309,14 +1310,9 @@ void ide_atapi_cmd(IDEState *s)
trace_ide_atapi_cmd(s, s->io_buffer[0]);
if (trace_event_get_state_backends(TRACE_IDE_ATAPI_CMD_PACKET)) {
- /* Each pretty-printed byte needs two bytes and a space; */
- char *ppacket = g_malloc(ATAPI_PACKET_SIZE * 3 + 1);
- int i;
- for (i = 0; i < ATAPI_PACKET_SIZE; i++) {
- sprintf(ppacket + (i * 3), "%02x ", buf[i]);
- }
- trace_ide_atapi_cmd_packet(s, s->lcyl | (s->hcyl << 8), ppacket);
- g_free(ppacket);
+ g_autoptr(GString) str =
+ qemu_hexdump_line(NULL, buf, ATAPI_PACKET_SIZE, 1, 0);
+ trace_ide_atapi_cmd_packet(s, s->lcyl | (s->hcyl << 8), 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 <=
[PATCH v3 10/27] hw/dma/pl330: Use qemu_hexdump_line to avoid sprintf, Richard Henderson, 2024/04/12
[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