qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, qemu-arm@nongnu.org, qemu-block@nongnu.org,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 08/12] util/hexdump: Replace sprintf() by g_string_append_printf()
Date: Wed, 10 Apr 2024 18:06:09 +0200	[thread overview]
Message-ID: <20240410160614.90627-9-philmd@linaro.org> (raw)
In-Reply-To: <20240410160614.90627-1-philmd@linaro.org>

sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1,
resulting in painful developper experience.

Replace sprintf() by GString API in order to avoid:

  [426/1310] Compiling C object libqemuutil.a.p/util_hexdump.c.o
  util/hexdump.c:35:21: warning: 'sprintf' is deprecated:
    This function is provided for compatibility reasons only.
    Due to security concerns inherent in the design of sprintf(3),
    it is highly recommended that you use snprintf(3) instead.
    [-Wdeprecated-declarations]
            line += sprintf(line, " %02x", (unsigned char)buf[b + i]);
                    ^
  util/hexdump.c:37:21: warning: 'sprintf' is deprecated:
            line += sprintf(line, "   ");
                    ^
  2 warnings generated.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 util/hexdump.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/util/hexdump.c b/util/hexdump.c
index b6f70e93bb..2ec1171de3 100644
--- a/util/hexdump.c
+++ b/util/hexdump.c
@@ -19,7 +19,7 @@
 char *qemu_hexdump_line(const void *bufptr, unsigned offset,
                         unsigned int len, bool ascii)
 {
-    char linebuf[QEMU_HEXDUMP_LINE_BYTES], *line = linebuf;
+    g_autoptr(GString) gs = g_string_sized_new(QEMU_HEXDUMP_LINE_BYTES);
     const char *buf = bufptr;
     int i, c;
 
@@ -27,30 +27,29 @@ char *qemu_hexdump_line(const void *bufptr, unsigned offset,
         len = QEMU_HEXDUMP_LINE_BYTES;
     }
 
-    line += snprintf(line, 6, "%04x:", offset);
+    g_string_append_printf(gs, "%04x:", offset);
     for (i = 0; i < QEMU_HEXDUMP_LINE_BYTES; i++) {
         if ((i % 4) == 0) {
-            *line++ = ' ';
+            g_string_append_c(gs, ' ');
         }
         if (i < len) {
-            line += sprintf(line, " %02x", (unsigned char)buf[offset + i]);
+            g_string_append_printf(gs, " %02x", (unsigned char)buf[offset + i]);
         } else {
-            line += sprintf(line, "   ");
+            g_string_append(gs, "   ");
         }
     }
     if (ascii) {
-        *line++ = ' ';
+        g_string_append_c(gs, ' ');
         for (i = 0; i < len; i++) {
             c = buf[offset + i];
             if (c < ' ' || c > '~') {
                 c = '.';
             }
-            *line++ = c;
+            g_string_append_c(gs, c);
         }
     }
-    *line = '\0';
 
-    return g_strdup(linebuf);
+    return g_strdup(gs->str);
 }
 
 void qemu_hexdump(FILE *fp, const char *prefix,
-- 
2.41.0



  parent reply	other threads:[~2024-04-10 16:10 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-10 16:06 [PATCH 00/12] misc: Remove sprintf() due to macOS deprecation Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 01/12] ui/console-vc: Replace sprintf() by g_strdup_printf() Philippe Mathieu-Daudé
2024-04-11  6:58   ` Marc-André Lureau
2024-04-11  7:47   ` Gerd Hoffmann
2024-04-11  9:36     ` Philippe Mathieu-Daudé
2024-04-11 10:02       ` Gerd Hoffmann
2024-04-10 16:06 ` [PATCH 02/12] hw/vfio/pci: " Philippe Mathieu-Daudé
2024-04-12 15:25   ` Alex Williamson
2024-04-15 14:01     ` Cédric Le Goater
2024-04-10 16:06 ` [PATCH 03/12] hw/ppc/spapr: " Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 04/12] hw/mips/malta: Replace sprintf() by g_string_append_printf() Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 05/12] system/qtest: " Philippe Mathieu-Daudé
2024-04-11  6:30   ` Thomas Huth
2024-04-10 16:06 ` [PATCH 06/12] util/hexdump: Rename @offset argument in qemu_hexdump_line() Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 07/12] util/hexdump: Have qemu_hexdump_line() return heap allocated buffer Philippe Mathieu-Daudé
2024-04-10 16:06 ` Philippe Mathieu-Daudé [this message]
2024-04-10 16:06 ` [PATCH 09/12] hw/scsi/scsi-disk: Use qemu_hexdump_line() to avoid sprintf() Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 10/12] hw/ide/atapi: " Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 11/12] hw/dma/pl330: " Philippe Mathieu-Daudé
2024-04-10 16:06 ` [PATCH 12/12] backends/tpm: " Philippe Mathieu-Daudé
2024-04-10 19:51   ` Stefan Berger
2024-04-10 19:12 ` [PATCH 00/12] misc: Remove sprintf() due to macOS deprecation Richard Henderson
2024-04-10 22:27   ` BALATON Zoltan
2024-04-11  9:38     ` Philippe Mathieu-Daudé
2024-04-19 10:48       ` Daniel P. Berrangé

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=20240410160614.90627-9-philmd@linaro.org \
    --to=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@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).