From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>
Subject: [PULL 07/16] hw/ide/atapi: Use qemu_hexdump_line to avoid sprintf
Date: Wed, 5 Jun 2024 14:15:12 -0700 [thread overview]
Message-ID: <20240605211521.577094-8-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240605211521.577094-1-richard.henderson@linaro.org>
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>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-10-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
next prev parent reply other threads:[~2024-06-05 21:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
2024-06-05 21:15 ` [PULL 01/16] util/hexdump: Use a GString for qemu_hexdump_line Richard Henderson
2024-06-05 21:15 ` [PULL 02/16] util/hexdump: Add unit_len and block_len to qemu_hexdump_line Richard Henderson
2024-06-05 21:15 ` [PULL 03/16] util/hexdump: Inline g_string_append_printf "%02x" Richard Henderson
2024-06-05 21:15 ` [PULL 04/16] hw/mips/malta: Add re-usable rng_seed_hex_new() method Richard Henderson
2024-06-05 21:15 ` [PULL 05/16] system/qtest: Replace sprintf by qemu_hexdump_line Richard Henderson
2024-06-05 21:15 ` [PULL 06/16] hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprintf Richard Henderson
2024-06-05 21:15 ` Richard Henderson [this message]
2024-06-05 21:15 ` [PULL 08/16] hw/dma/pl330: " Richard Henderson
2024-06-05 21:15 ` [PULL 09/16] disas/microblaze: Split out print_immval_addr Richard Henderson
2024-06-05 21:15 ` [PULL 10/16] disas/microblaze: Re-indent print_insn_microblaze Richard Henderson
2024-06-05 21:15 ` [PULL 11/16] disas/microblaze: Merge op->name output into each fprintf Richard Henderson
2024-06-05 21:15 ` [PULL 12/16] disas/microblaze: Print registers directly with PRIreg Richard Henderson
2024-06-05 21:15 ` [PULL 13/16] disas/microblaze: Print immediates directly with PRIimm Richard Henderson
2024-06-05 21:15 ` [PULL 14/16] disas/microblaze: Print registers directly with PRIrfsl Richard Henderson
2024-06-05 21:15 ` [PULL 15/16] disas/microblaze: Split get_field_special Richard Henderson
2024-06-05 21:15 ` [PULL 16/16] disas/riscv: Use GString in format_inst Richard Henderson
2024-06-05 23:53 ` [PULL 00/16] sprintf fixes Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240605211521.577094-8-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=philmd@linaro.org \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).