netlink_sock_diag: print inet_diag_sockid.idiag_if as an interface index

[strace] / futex.c

diff --git a/futex.c b/futex.c
index ff91ab706108a442b1c0251530c4e72940a1767d..16ccddb77f598e976ccd9cc27baaf3cace7cac6b 100644 (file)
--- a/futex.c
+++ b/futex.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2007-2008 Ulrich Drepper <drepper@redhat.com>
  * Copyright (c) 2009 Andreas Schwab <schwab@redhat.com>
  * Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,14 +44,15 @@
 
 SYS_FUNC(futex)
 {
-       const kernel_ureg_t uaddr = tcp->u_arg[0];
+       const kernel_ulong_t uaddr = tcp->u_arg[0];
        const int op = tcp->u_arg[1];
        const int cmd = op & 127;
-       const kernel_ureg_t timeout = tcp->u_arg[3];
-       const kernel_ureg_t uaddr2 = tcp->u_arg[4];
+       const kernel_ulong_t timeout = tcp->u_arg[3];
+       const kernel_ulong_t uaddr2 = tcp->u_arg[4];
        const unsigned int val = tcp->u_arg[2];
        const unsigned int val2 = tcp->u_arg[3];
        const unsigned int val3 = tcp->u_arg[5];
+       const char *comment;
 
        printaddr(uaddr);
        tprints(", ");
@@ -94,15 +96,15 @@ SYS_FUNC(futex)
                tprints(", ");
                if ((val3 >> 28) & 8)
                        tprints("FUTEX_OP_OPARG_SHIFT<<28|");
-               if (printxval(futexwakeops, (val3 >> 28) & 0x7, NULL))
-                       tprints("<<28");
-               else
-                       tprints("<<28 /* FUTEX_OP_??? */");
+               comment = printxval(futexwakeops, (val3 >> 28) & 0x7, NULL)
+                       ? NULL : "FUTEX_OP_???";
+               tprints("<<28");
+               tprints_comment(comment);
                tprintf("|%#x<<12|", (val3 >> 12) & 0xfff);
-               if (printxval(futexwakecmps, (val3 >> 24) & 0xf, NULL))
-                       tprints("<<24");
-               else
-                       tprints("<<24 /* FUTEX_OP_CMP_??? */");
+               comment = printxval(futexwakecmps, (val3 >> 24) & 0xf, NULL)
+                       ? NULL : "FUTEX_OP_CMP_???";
+               tprints("<<24");
+               tprints_comment(comment);
                tprintf("|%#x", val3 & 0xfff);
                break;
        case FUTEX_WAIT_REQUEUE_PI:
@@ -121,7 +123,8 @@ SYS_FUNC(futex)
                break;
        default:
                tprintf(", %u", val);
-               tprintf(", %#lx", timeout);
+               tprints(", ");
+               printaddr(timeout);
                tprints(", ");
                printaddr(uaddr2);
                tprintf(", %#x", val3);