diff mbox series

[v3,09/27] hw/ide/atapi: Use qemu_hexdump_line to avoid sprintf

Message ID 20240412073346.458116-10-richard.henderson@linaro.org
State Superseded
Headers show
Series misc: Replace sprintf | expand

Commit Message

Richard Henderson April 12, 2024, 7:33 a.m. UTC 
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(-)

Comments

Pierrick Bouvier June 3, 2024, 6:57 p.m. UTC | #1 
On 4/12/24 00:33, Richard Henderson wrote:
> 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);
>       }
>   
>       /*

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff mbox series

Patch

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);
     }
 
     /*