From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org, qemu-block@nongnu.org, qemu-ppc@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v2 09/13] util/hexdump: Replace sprintf() by g_string_append_printf()
Date: Thu, 11 Apr 2024 12:15:45 +0200 [thread overview]
Message-ID: <20240411101550.99392-10-philmd@linaro.org> (raw)
In-Reply-To: <20240411101550.99392-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
next prev parent reply other threads:[~2024-04-11 10:21 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-11 10:15 [PATCH v2 00/13] misc: Remove sprintf() due to macOS deprecation Philippe Mathieu-Daudé
2024-04-11 10:15 ` [PATCH v2 01/13] ui/console-vc: Replace sprintf() by snprintf() Philippe Mathieu-Daudé
2024-04-11 10:21 ` Marc-André Lureau
2024-04-11 19:27 ` Richard Henderson
2024-04-11 10:15 ` [PATCH v2 02/13] hw/vfio/pci: " Philippe Mathieu-Daudé
2024-04-11 19:42 ` Richard Henderson
2024-04-11 10:15 ` [PATCH v2 03/13] hw/ppc/spapr: " Philippe Mathieu-Daudé
2024-04-11 19:47 ` Richard Henderson
2024-04-15 6:44 ` Harsh Prateek Bora
2024-04-11 10:15 ` [PATCH v2 04/13] hw/mips/malta: Add re-usable rng_seed_hex_new() method Philippe Mathieu-Daudé
2024-04-11 20:07 ` Richard Henderson
2024-04-11 20:31 ` Richard Henderson
2024-04-11 10:15 ` [PATCH v2 05/13] hw/mips/malta: Replace sprintf() by snprintf() Philippe Mathieu-Daudé
2024-04-11 10:15 ` [PATCH v2 06/13] system/qtest: Replace sprintf() by g_string_append_printf() Philippe Mathieu-Daudé
2024-04-11 20:13 ` Richard Henderson
2024-04-11 10:15 ` [PATCH v2 07/13] util/hexdump: Rename @offset argument in qemu_hexdump_line() Philippe Mathieu-Daudé
2024-04-11 20:34 ` Richard Henderson
2024-04-11 10:15 ` [PATCH v2 08/13] util/hexdump: Have qemu_hexdump_line() return heap allocated buffer Philippe Mathieu-Daudé
2024-04-11 20:47 ` Richard Henderson
2024-04-11 10:15 ` Philippe Mathieu-Daudé [this message]
2024-04-11 20:43 ` [PATCH v2 09/13] util/hexdump: Replace sprintf() by g_string_append_printf() Philippe Mathieu-Daudé
2024-04-11 20:50 ` Richard Henderson
2024-04-11 10:15 ` [PATCH v2 10/13] hw/scsi/scsi-disk: Use qemu_hexdump_line() to avoid sprintf() Philippe Mathieu-Daudé
2024-04-11 20:53 ` Richard Henderson
2024-04-11 10:15 ` [PATCH v2 11/13] hw/ide/atapi: " Philippe Mathieu-Daudé
2024-04-11 10:15 ` [PATCH v2 12/13] hw/dma/pl330: " Philippe Mathieu-Daudé
2024-04-11 10:15 ` [PATCH v2 13/13] backends/tpm: " Philippe Mathieu-Daudé
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=20240411101550.99392-10-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).