/*
* Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
* Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * Copyright (c) 1999-2017 The strace developers.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
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;
}
static int
-decode_poll_exiting(struct tcb *tcp, const long 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;
*outptr++ = '[';
else
outptr = stpcpy(outptr, ", ");
- outptr += sprintf(outptr, "%#lx", cur);
+ outptr += sprintf(outptr, "%#" PRI_klx, cur);
break;
}
if (!fds.revents)
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 {