x32: fix decoding of 3rd argument of preadv* and pwritev* syscalls

[strace] / mknod.c

diff --git a/mknod.c b/mknod.c
index 14d9ddd74d78a2f0a96f31468d22e2fd525d2f23..9b903116364bfce168fbf756ae3283d95b17bdb9 100644 (file)
--- a/mknod.c
+++ b/mknod.c
@@ -35,28 +35,22 @@
 
 #include <fcntl.h>
 #include <sys/stat.h>
-
-#ifdef MAJOR_IN_SYSMACROS
-# include <sys/sysmacros.h>
-#endif
-
-#ifdef MAJOR_IN_MKDEV
-# include <sys/mkdev.h>
-#endif
+#include <sys/sysmacros.h>
 
 static void
 decode_mknod(struct tcb *tcp, int offset)
 {
-       int mode = tcp->u_arg[offset + 1];
+       unsigned short mode = tcp->u_arg[offset + 1];
+       unsigned int dev;
 
        printpath(tcp, tcp->u_arg[offset]);
-       tprintf(", %s", sprintmode(mode));
+       tprints(", ");
+       print_symbolic_mode_t(mode);
        switch (mode & S_IFMT) {
        case S_IFCHR:
        case S_IFBLK:
-               tprintf(", makedev(%lu, %lu)",
-                       (unsigned long) major(tcp->u_arg[offset + 2]),
-                       (unsigned long) minor(tcp->u_arg[offset + 2]));
+               dev = tcp->u_arg[offset + 2];
+               tprintf(", makedev(%u, %u)", major(dev), minor(dev));
                break;
        }
 }