strace.spec.in: compress changelog files

[strace] / epoll.c

diff --git a/epoll.c b/epoll.c
index 7382e0c0af6bb18e3aeb9db2fd725129f3448912..80883c985a416c6367b3667df5e3008ab5cc0f20 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-2018 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -93,7 +94,7 @@ epoll_wait_common(struct tcb *tcp)
        } else {
                struct epoll_event ev;
                print_array(tcp, tcp->u_arg[1], tcp->u_rval, &ev, sizeof(ev),
-                           umoven_or_printaddr, print_epoll_event, 0);
+                           tfetch_mem, print_epoll_event, 0);
                tprintf(", %d, %d", (int) tcp->u_arg[2], (int) tcp->u_arg[3]);
        }
 }
@@ -109,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;
 }