tests: fix format warnings on x32

[strace] / fanotify.c

diff --git a/fanotify.c b/fanotify.c
index c8a7e37057ca47d000c527355bbc31ee8c5f7f6b..91edf068222cab2fe3f0256c63f1c0de47913709 100644 (file)
--- a/fanotify.c
+++ b/fanotify.c
@@ -1,30 +1,27 @@
+/*
+ * Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2019 The strace developers.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "defs.h"
-#include <linux/fanotify.h>
 
-static const struct xlat fan_classes[] = {
-       XLAT(FAN_CLASS_NOTIF),
-       XLAT(FAN_CLASS_CONTENT),
-       XLAT(FAN_CLASS_PRE_CONTENT),
-       XLAT_END
-};
+#include "xlat/fan_classes.h"
+#include "xlat/fan_init_flags.h"
 
-static const struct xlat fan_init_flags[] = {
-       XLAT(FAN_CLOEXEC),
-       XLAT(FAN_NONBLOCK),
-       XLAT(FAN_UNLIMITED_QUEUE),
-       XLAT(FAN_UNLIMITED_MARKS),
-       XLAT_END
-};
+#ifndef FAN_ALL_CLASS_BITS
+# define FAN_ALL_CLASS_BITS (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | FAN_CLASS_PRE_CONTENT)
+#endif
+#ifndef FAN_NOFD
+# define FAN_NOFD -1
+#endif
 
-int
-sys_fanotify_init(struct tcb *tcp)
+SYS_FUNC(fanotify_init)
 {
-       unsigned flags;
-
-       if (exiting(tcp))
-               return 0;
+       unsigned int flags = tcp->u_arg[0];
 
-       flags = tcp->u_arg[0];
        printxval(fan_classes, flags & FAN_ALL_CLASS_BITS, "FAN_CLASS_???");
        flags &= ~FAN_ALL_CLASS_BITS;
        if (flags) {
@@ -34,53 +31,36 @@ sys_fanotify_init(struct tcb *tcp)
        tprints(", ");
        tprint_open_modes((unsigned) tcp->u_arg[1]);
 
-       return 0;
+       return RVAL_DECODED | RVAL_FD;
 }
 
-static const struct xlat fan_mark_flags[] = {
-       XLAT(FAN_MARK_ADD),
-       XLAT(FAN_MARK_REMOVE),
-       XLAT(FAN_MARK_DONT_FOLLOW),
-       XLAT(FAN_MARK_ONLYDIR),
-       XLAT(FAN_MARK_MOUNT),
-       XLAT(FAN_MARK_IGNORED_MASK),
-       XLAT(FAN_MARK_IGNORED_SURV_MODIFY),
-       XLAT(FAN_MARK_FLUSH),
-       XLAT_END
-};
-
-static const struct xlat fan_event_flags[] = {
-       XLAT(FAN_ACCESS),
-       XLAT(FAN_MODIFY),
-       XLAT(FAN_CLOSE),
-       XLAT(FAN_CLOSE_WRITE),
-       XLAT(FAN_CLOSE_NOWRITE),
-       XLAT(FAN_OPEN),
-       XLAT(FAN_Q_OVERFLOW),
-       XLAT(FAN_OPEN_PERM),
-       XLAT(FAN_ACCESS_PERM),
-       XLAT(FAN_ONDIR),
-       XLAT(FAN_EVENT_ON_CHILD),
-       XLAT_END
-};
+#include "xlat/fan_mark_flags.h"
+#include "xlat/fan_event_flags.h"
 
-int
-sys_fanotify_mark(struct tcb *tcp)
+SYS_FUNC(fanotify_mark)
 {
-       if (exiting(tcp))
-               return 0;
-
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
-       printflags(fan_mark_flags, (unsigned) tcp->u_arg[1], "FAN_MARK_???");
+       printflags(fan_mark_flags, tcp->u_arg[1], "FAN_MARK_???");
        tprints(", ");
-       printflags(fan_event_flags, tcp->u_arg[2], "FAN_???");
+       /*
+        * the mask argument is defined as 64-bit,
+        * but kernel uses the lower 32 bits only.
+        */
+       unsigned long long mask = 0;
+       int argn = getllval(tcp, &mask, 2);
+#ifdef HPPA
+       /* Parsic is weird.  See arch/parisc/kernel/sys_parisc32.c.  */
+       mask = (mask << 32) | (mask >> 32);
+#endif
+       printflags64(fan_event_flags, mask, "FAN_???");
        tprints(", ");
-       if ((int) tcp->u_arg[3] == FAN_NOFD)
-               tprints("FAN_NOFD, ");
+       if ((int) tcp->u_arg[argn] == FAN_NOFD)
+               print_xlat_d(FAN_NOFD);
        else
-               print_dirfd(tcp, tcp->u_arg[3]);
-       printpath(tcp, tcp->u_arg[4]);
+               print_dirfd(tcp, tcp->u_arg[argn]);
+       tprints(", ");
+       printpath(tcp, tcp->u_arg[argn + 1]);
 
-       return 0;
+       return RVAL_DECODED;
 }