[06/10] linux-user: Correct print_sockaddr() format

Commit Message

Richard Henderson Oct. 5, 2024, 11:33 p.m. UTC

From: Philippe Mathieu-Daudé <[e-mail]>

When the %addr argument can not be accessed, a double comma
is logged (the final qemu_log call prepend a comma).  Move
the comma from the final qemu_log to the preceeding switch
cases that had omitted it.

Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
Message-Id: <[e-mail]>
Acked-by: Ilya Leoshkevich <[e-mail]>
[rth: Move comma into the various switch cases.]
Signed-off-by: Richard Henderson <[e-mail]>
---
 linux-user/strace.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Philippe Mathieu-Daudé Oct. 7, 2024, 7:50 p.m. UTC | #1

On 5/10/24 20:33, Richard Henderson wrote:
> From: Philippe Mathieu-Daudé <[e-mail]>
> 
> When the %addr argument can not be accessed, a double comma
> is logged (the final qemu_log call prepend a comma).  Move
> the comma from the final qemu_log to the preceeding switch
> cases that had omitted it.
> 
> Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
> Message-Id: <[e-mail]>
> Acked-by: Ilya Leoshkevich <[e-mail]>
> [rth: Move comma into the various switch cases.]

Thanks!

> Signed-off-by: Richard Henderson <[e-mail]>
> ---
>   linux-user/strace.c | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)

Patch

diff --git a/linux-user/strace.c b/linux-user/strace.c
index cf9eaf71c9..dfdec58542 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -376,7 +376,7 @@  print_sockaddr(abi_ulong addr, abi_long addrlen, int last)
                  un->sun_path[i]; i++) {
                 qemu_log("%c", un->sun_path[i]);
             }
-            qemu_log("\"}");
+            qemu_log("\"},");
             break;
         }
         case AF_INET: {
@@ -386,7 +386,7 @@  print_sockaddr(abi_ulong addr, abi_long addrlen, int last)
                      ntohs(in->sin_port));
             qemu_log("sin_addr=inet_addr(\"%d.%d.%d.%d\")",
                      c[0], c[1], c[2], c[3]);
-            qemu_log("}");
+            qemu_log("},");
             break;
         }
         case AF_PACKET: {
@@ -417,12 +417,12 @@  print_sockaddr(abi_ulong addr, abi_long addrlen, int last)
             }
             qemu_log(",sll_addr=%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x",
                      c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7]);
-            qemu_log("}");
+            qemu_log("},");
             break;
         }
         case AF_NETLINK: {
             struct target_sockaddr_nl *nl = (struct target_sockaddr_nl *)sa;
-            qemu_log("{nl_family=AF_NETLINK,nl_pid=%u,nl_groups=%u}",
+            qemu_log("{nl_family=AF_NETLINK,nl_pid=%u,nl_groups=%u},",
                      tswap32(nl->nl_pid), tswap32(nl->nl_groups));
             break;
         }
@@ -432,14 +432,14 @@  print_sockaddr(abi_ulong addr, abi_long addrlen, int last)
                 qemu_log("%02x, ", sa->sa_data[i]);
             }
             qemu_log("%02x}", sa->sa_data[i]);
-            qemu_log("}");
+            qemu_log("},");
             break;
         }
         unlock_user(sa, addr, 0);
     } else {
         print_raw_param("0x"TARGET_ABI_FMT_lx, addr, 0);
     }
-    qemu_log(", "TARGET_ABI_FMT_ld"%s", addrlen, get_comma(last));
+    qemu_log(TARGET_ABI_FMT_ld"%s", addrlen, get_comma(last));
 }
 
 static void