msghdr.c: print struct mmsghdr as a regular structure

* msghdr.c (decode_mmsghdr): Print names of msg_hdr and msg_len fields.
* tests/mmsg.c (main): Update expected output.

diff --git a/msghdr.c b/msghdr.c
index aa283b0c817426cf461adf17dc22b01f408fd60f..931d3bd0e4b6f8dadb46e4507aa9f4e0d24efecc 100644 (file)
--- a/msghdr.c
+++ b/msghdr.c
@@ -379,9 +379,9 @@ decode_mmsghdr(struct tcb *tcp, long addr, bool use_msg_len)
        int fetched = fetch_struct_mmsghdr(tcp, addr, &mmsg);
 
        if (fetched) {
-               tprints("{");
+               tprints("{msg_hdr=");
                print_msghdr(tcp, &mmsg.msg_hdr, use_msg_len ? mmsg.msg_len : -1UL);
-               tprintf(", %u}", mmsg.msg_len);
+               tprintf(", msg_len=%u}", mmsg.msg_len);
        } else {
                printaddr(addr);
        }

diff --git a/tests/mmsg.c b/tests/mmsg.c
index d82b7cddf848a6f2a969ef7b7869ad477d909606..cafe7dd466e5c7f83d60bfb714d33b243afa3f63 100644 (file)
--- a/tests/mmsg.c
+++ b/tests/mmsg.c
@@ -139,12 +139,12 @@ main(void)
                perror_msg_and_skip("sendmmsg");
        assert(r == (int) n_w_mmh);
        assert(close(1) == 0);
-       tprintf("sendmmsg(1, [{{msg_name=NULL, msg_namelen=0"
+       tprintf("sendmmsg(1, [{msg_hdr={msg_name=NULL, msg_namelen=0"
                ", msg_iov=[{\"%s\", %u}, {\"%s\", %u}], msg_iovlen=%u"
-               ", msg_controllen=0, msg_flags=0}, %u}"
-               ", {{msg_name=NULL, msg_namelen=0"
+               ", msg_controllen=0, msg_flags=0}, msg_len=%u}"
+               ", {msg_hdr={msg_name=NULL, msg_namelen=0"
                ", msg_iov=[{\"%s\", %u}], msg_iovlen=%u"
-               ", msg_controllen=0, msg_flags=0}, %u}], %u"
+               ", msg_controllen=0, msg_flags=0}, msg_len=%u}], %u"
                ", MSG_DONTROUTE|MSG_NOSIGNAL) = %d\n"
                " = %u buffers in vector 0\n"
                " * %u bytes in buffer 0\n"
@@ -213,12 +213,12 @@ main(void)
 
        assert(recv_mmsg(0, r_mmh, n_r_mmh, MSG_DONTWAIT, NULL) == (int) n_r_mmh);
        assert(close(0) == 0);
-       tprintf("recvmmsg(0, [{{msg_name=NULL, msg_namelen=0"
+       tprintf("recvmmsg(0, [{msg_hdr={msg_name=NULL, msg_namelen=0"
                ", msg_iov=[{\"%s\", %u}], msg_iovlen=%u"
-               ", msg_controllen=0, msg_flags=0}, %u}"
-               ", {{msg_name=NULL, msg_namelen=0"
+               ", msg_controllen=0, msg_flags=0}, msg_len=%u}"
+               ", {msg_hdr={msg_name=NULL, msg_namelen=0"
                ", msg_iov=[{\"%s\", %u}, {\"\", %u}], msg_iovlen=%u"
-               ", msg_controllen=0, msg_flags=0}, %u}], %u"
+               ", msg_controllen=0, msg_flags=0}, msg_len=%u}], %u"
                ", MSG_DONTWAIT, NULL) = %d (left NULL)\n"
                " = %u buffers in vector 0\n"
                " * %u bytes in buffer 0\n"