qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 06/16] hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprintf
Date: Wed,  5 Jun 2024 14:15:11 -0700	[thread overview]
Message-ID: <20240605211521.577094-7-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.

Note that this drops the "0x" prefix to every byte, which should
be of no consequence to tracing.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240412073346.458116-9-richard.henderson@linaro.org>
---
 hw/scsi/scsi-disk.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 4bd7af9d0c..f386a2f01c 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -2648,19 +2648,12 @@ static const SCSIReqOps *const scsi_disk_reqops_dispatch[256] = {
 
 static void scsi_disk_new_request_dump(uint32_t lun, uint32_t tag, uint8_t *buf)
 {
-    int i;
     int len = scsi_cdb_length(buf);
-    char *line_buffer, *p;
+    g_autoptr(GString) str = NULL;
 
     assert(len > 0 && len <= 16);
-    line_buffer = g_malloc(len * 5 + 1);
-
-    for (i = 0, p = line_buffer; i < len; i++) {
-        p += sprintf(p, " 0x%02x", buf[i]);
-    }
-    trace_scsi_disk_new_request(lun, tag, line_buffer);
-
-    g_free(line_buffer);
+    str = qemu_hexdump_line(NULL, buf, len, 1, 0);
+    trace_scsi_disk_new_request(lun, tag, str->str);
 }
 
 static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun,
-- 
2.34.1



  parent reply	other threads:[~2024-06-05 21:16 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 ` Richard Henderson [this message]
2024-06-05 21:15 ` [PULL 07/16] hw/ide/atapi: Use qemu_hexdump_line to avoid sprintf Richard Henderson
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-7-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=philmd@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).