tests: check decoding of netlink smc_diag_msg attributes

[strace] / epoll.c

diff --git a/epoll.c b/epoll.c
index 20d306c4ef4001737687367664547de639384c39..d5f2f551a1b3271be60e1bd8ac3b0c20ffcbead3 100644 (file)
--- a/epoll.c
+++ b/epoll.c
@@ -2,6 +2,7 @@
  * Copyright (c) 2004-2007 Ulrich Drepper <drepper@redhat.com>
  * Copyright (c) 2004 Roland McGrath <roland@redhat.com>
  * Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,12 +71,13 @@ SYS_FUNC(epoll_ctl)
 {
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
-       printxval(epollctls, tcp->u_arg[1], "EPOLL_CTL_???");
+       const unsigned int op = tcp->u_arg[1];
+       printxval(epollctls, op, "EPOLL_CTL_???");
        tprints(", ");
        printfd(tcp, tcp->u_arg[2]);
        tprints(", ");
        struct epoll_event ev;
-       if (EPOLL_CTL_DEL == tcp->u_arg[1])
+       if (EPOLL_CTL_DEL == op)
                printaddr(tcp->u_arg[3]);
        else if (!umove_or_printaddr(tcp, tcp->u_arg[3], &ev))
                print_epoll_event(tcp, &ev, sizeof(ev), 0);
@@ -108,9 +110,9 @@ SYS_FUNC(epoll_pwait)
        epoll_wait_common(tcp);
        if (exiting(tcp)) {
                tprints(", ");
-               /* NB: kernel requires arg[5] == NSIG / 8 */
+               /* NB: kernel requires arg[5] == NSIG_BYTES */
                print_sigset_addr_len(tcp, tcp->u_arg[4], tcp->u_arg[5]);
-               tprintf(", %lu", tcp->u_arg[5]);
+               tprintf(", %" PRI_klu, tcp->u_arg[5]);
        }
        return 0;
 }