Print struct iovec as a regular structure

[strace] / mq.c

diff --git a/mq.c b/mq.c
index 464045ff75bf091cb24e24cad42a16d502ae67d0..e12eef7c6ab3e25d672d508364a39e5e529a2131 100644 (file)
--- a/mq.c
+++ b/mq.c
@@ -29,8 +29,6 @@
 #include "defs.h"
 #include <fcntl.h>
 
-extern void printmqattr(struct tcb *tcp, const long addr);
-
 SYS_FUNC(mq_open)
 {
        printpath(tcp, tcp->u_arg[0]);
@@ -50,7 +48,7 @@ SYS_FUNC(mq_timedsend)
        tprintf("%ld, ", tcp->u_arg[0]);
        printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
        tprintf(", %lu, %ld, ", tcp->u_arg[2], tcp->u_arg[3]);
-       printtv(tcp, tcp->u_arg[4]);
+       print_timespec(tcp, tcp->u_arg[4]);
        return RVAL_DECODED;
 }
 
@@ -61,7 +59,14 @@ SYS_FUNC(mq_timedreceive)
        else {
                printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
                tprintf(", %lu, %ld, ", tcp->u_arg[2], tcp->u_arg[3]);
-               printtv(tcp, tcp->u_arg[4]);
+               /*
+                * Since the timeout parameter is read by the kernel
+                * on entering syscall, it has to be decoded the same way
+                * whether the syscall has failed or not.
+                */
+               temporarily_clear_syserror(tcp);
+               print_timespec(tcp, tcp->u_arg[4]);
+               restore_cleared_syserror(tcp);
        }
        return 0;
 }
@@ -69,7 +74,7 @@ SYS_FUNC(mq_timedreceive)
 SYS_FUNC(mq_notify)
 {
        tprintf("%ld, ", tcp->u_arg[0]);
-       printsigevent(tcp, tcp->u_arg[1]);
+       print_sigevent(tcp, tcp->u_arg[1]);
        return RVAL_DECODED;
 }