tests: fix format warnings on x32

[strace] / fanotify.c

diff --git a/fanotify.c b/fanotify.c
index 63816b8d3e9a5b15fd09e468b87f73d91f7c223f..91edf068222cab2fe3f0256c63f1c0de47913709 100644 (file)
--- a/fanotify.c
+++ b/fanotify.c
@@ -1,3 +1,11 @@
+/*
+ * 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 "xlat/fan_classes.h"
@@ -10,15 +18,10 @@
 # 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) {
@@ -28,41 +31,36 @@ sys_fanotify_init(struct tcb *tcp)
        tprints(", ");
        tprint_open_modes((unsigned) tcp->u_arg[1]);
 
-       return 0;
+       return RVAL_DECODED | RVAL_FD;
 }
 
 #include "xlat/fan_mark_flags.h"
 #include "xlat/fan_event_flags.h"
 
-int
-sys_fanotify_mark(struct tcb *tcp)
+SYS_FUNC(fanotify_mark)
 {
-       unsigned long long mask = 0;
-       int argn;
-
-       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(", ");
        /*
         * the mask argument is defined as 64-bit,
         * but kernel uses the lower 32 bits only.
         */
-       argn = getllval(tcp, &mask, 2);
+       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
-       printflags(fan_event_flags, mask, "FAN_???");
+       printflags64(fan_event_flags, mask, "FAN_???");
        tprints(", ");
        if ((int) tcp->u_arg[argn] == FAN_NOFD)
-               tprints("FAN_NOFD, ");
+               print_xlat_d(FAN_NOFD);
        else
                print_dirfd(tcp, tcp->u_arg[argn]);
+       tprints(", ");
        printpath(tcp, tcp->u_arg[argn + 1]);
 
-       return 0;
+       return RVAL_DECODED;
 }