bpf: move common code to a separate function

[strace] / poll.c

diff --git a/poll.c b/poll.c
index 147f6b1a3d368b833402dd2e14a879f83078ee83..f2a2381489eb1667c2b0d8f68b5124b294321133 100644 (file)
--- a/poll.c
+++ b/poll.c
@@ -50,7 +50,7 @@ print_pollfd(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 static void
 decode_poll_entering(struct tcb *tcp)
 {
-       const kernel_ureg_t addr = tcp->u_arg[0];
+       const kernel_ulong_t addr = tcp->u_arg[0];
        const unsigned int nfds = tcp->u_arg[1];
        struct pollfd fds;
 
@@ -60,14 +60,14 @@ decode_poll_entering(struct tcb *tcp)
 }
 
 static int
-decode_poll_exiting(struct tcb *const tcp, const kernel_ureg_t pts)
+decode_poll_exiting(struct tcb *const tcp, const kernel_ulong_t pts)
 {
        struct pollfd fds;
        const unsigned int nfds = tcp->u_arg[1];
        const unsigned long size = sizeof(fds) * nfds;
-       const kernel_ureg_t start = tcp->u_arg[0];
-       const kernel_ureg_t end = start + size;
-       kernel_ureg_t cur;
+       const kernel_ulong_t start = tcp->u_arg[0];
+       const kernel_ulong_t end = start + size;
+       kernel_ulong_t cur;
        const unsigned int max_printed =
                abbrev(tcp) ? max_strlen : -1U;
        unsigned int printed;
@@ -95,7 +95,7 @@ decode_poll_exiting(struct tcb *const tcp, const kernel_ureg_t pts)
                                *outptr++ = '[';
                        else
                                outptr = stpcpy(outptr, ", ");
-                       outptr += sprintf(outptr, "%#lx", cur);
+                       outptr += sprintf(outptr, "%#" PRI_klx, cur);
                        break;
                }
                if (!fds.revents)
@@ -176,9 +176,9 @@ SYS_FUNC(ppoll)
 
                print_timespec(tcp, tcp->u_arg[2]);
                tprints(", ");
-               /* NB: kernel requires arg[4] == NSIG / 8 */
+               /* NB: kernel requires arg[4] == NSIG_BYTES */
                print_sigset_addr_len(tcp, tcp->u_arg[3], tcp->u_arg[4]);
-               tprintf(", %lu", tcp->u_arg[4]);
+               tprintf(", %" PRI_klu, tcp->u_arg[4]);
 
                return 0;
        } else {