io: change size types from unsigned long to kernel_ureg_t

[strace] / futex.c

diff --git a/futex.c b/futex.c
index 9410b2a6a4fdde168ed91965c5f2dcc86a810498..ff91ab706108a442b1c0251530c4e72940a1767d 100644 (file)
--- a/futex.c
+++ b/futex.c
@@ -30,10 +30,6 @@
 
 #include "defs.h"
 
-#ifdef HAVE_LINUX_FUTEX_H
-# include <linux/futex.h>
-#endif
-
 #ifndef FUTEX_PRIVATE_FLAG
 # define FUTEX_PRIVATE_FLAG 128
 #endif
@@ -47,11 +43,11 @@
 
 SYS_FUNC(futex)
 {
-       const long uaddr = tcp->u_arg[0];
+       const kernel_ureg_t uaddr = tcp->u_arg[0];
        const int op = tcp->u_arg[1];
        const int cmd = op & 127;
-       const long timeout = tcp->u_arg[3];
-       const long uaddr2 = tcp->u_arg[4];
+       const kernel_ureg_t timeout = tcp->u_arg[3];
+       const kernel_ureg_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];
@@ -95,13 +91,19 @@ SYS_FUNC(futex)
                tprintf(", %u", val);
                tprintf(", %u, ", val2);
                printaddr(uaddr2);
-               tprints(", {");
+               tprints(", ");
                if ((val3 >> 28) & 8)
-                       tprints("FUTEX_OP_OPARG_SHIFT|");
-               printxval(futexwakeops, (val3 >> 28) & 0x7, "FUTEX_OP_???");
-               tprintf(", %u, ", (val3 >> 12) & 0xfff);
-               printxval(futexwakecmps, (val3 >> 24) & 0xf, "FUTEX_OP_CMP_???");
-               tprintf(", %u}", val3 & 0xfff);
+                       tprints("FUTEX_OP_OPARG_SHIFT<<28|");
+               if (printxval(futexwakeops, (val3 >> 28) & 0x7, NULL))
+                       tprints("<<28");
+               else
+                       tprints("<<28 /* FUTEX_OP_??? */");
+               tprintf("|%#x<<12|", (val3 >> 12) & 0xfff);
+               if (printxval(futexwakecmps, (val3 >> 24) & 0xf, NULL))
+                       tprints("<<24");
+               else
+                       tprints("<<24 /* FUTEX_OP_CMP_??? */");
+               tprintf("|%#x", val3 & 0xfff);
                break;
        case FUTEX_WAIT_REQUEUE_PI:
                tprintf(", %u", val);