}
static int
-decode_select(struct tcb *tcp, kernel_ureg_t *args,
- void (*print_tv_ts) (struct tcb *, const long),
- const char * (*sprint_tv_ts) (struct tcb *, const long))
+decode_select(struct tcb *const tcp, const kernel_ureg_t *const args,
+ void (*const print_tv_ts) (struct tcb *, kernel_ureg_t),
+ const char * (*const sprint_tv_ts) (struct tcb *, kernel_ureg_t))
{
int i, j;
int nfds, fdsize;
fd_set *fds = NULL;
const char *sep;
- long arg;
+ kernel_ureg_t addr;
- /* Kernel truncates arg[0] to int, we do the same. */
+ /* Kernel truncates args[0] to int, we do the same. */
nfds = (int) args[0];
/* Kernel rejects negative nfds, so we don't parse it either. */
if (verbose(tcp) && fdsize > 0)
fds = malloc(fdsize);
for (i = 0; i < 3; i++) {
- arg = args[i+1];
+ addr = args[i+1];
tprints(", ");
if (!fds) {
- printaddr(arg);
+ printaddr(addr);
continue;
}
- if (umoven_or_printaddr(tcp, arg, fdsize, fds))
+ if (umoven_or_printaddr(tcp, addr, fdsize, fds))
continue;
tprints("[");
for (j = 0, sep = "";; j++) {
for (i = 0; i < 3 && ready_fds > 0; i++) {
int first = 1;
- arg = args[i+1];
- if (!arg || !fds || umoven(tcp, arg, fdsize, fds) < 0)
+ addr = args[i+1];
+ if (!addr || !fds || umoven(tcp, addr, fdsize, fds) < 0)
continue;
for (j = 0;; j++) {
j = next_set_bit(fds, j, nfds);
}
static int
-umove_kulong_array_or_printaddr(struct tcb *tcp, const long addr,
- kernel_ulong_t *ptr, size_t n)
+umove_kulong_array_or_printaddr(struct tcb *const tcp, const kernel_ureg_t addr,
+ kernel_ulong_t *const ptr, const size_t n)
{
#ifndef current_klongsize
if (current_klongsize < sizeof(*ptr)) {
size_t i;
for (i = 0; i < n; ++i)
- ptr[i] = (kernel_ulong_t) ptr32[i];
+ ptr[i] = ptr32[i];
}
return r;
}
data, ARRAY_SIZE(data))) {
tprints("{");
/* NB: kernel requires data[1] == NSIG / 8 */
- print_sigset_addr_len(tcp, (unsigned long) data[0],
- (unsigned long) data[1]);
+ print_sigset_addr_len(tcp, data[0], data[1]);
tprintf(", %" PRI_klu "}", data[1]);
}
}