* Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
* 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
-print_rlimit64(struct tcb *tcp, unsigned long addr)
+print_rlimit64(struct tcb *const tcp, const kernel_ulong_t addr)
{
struct rlimit_64 {
uint64_t rlim_cur;
}
static void
-print_rlimit32(struct tcb *tcp, unsigned long addr)
+print_rlimit32(struct tcb *const tcp, const kernel_ulong_t addr)
{
struct rlimit_32 {
uint32_t rlim_cur;
}
static void
-decode_rlimit(struct tcb *tcp, unsigned long addr)
+decode_rlimit(struct tcb *const tcp, const kernel_ulong_t addr)
{
-# if defined(X86_64) || defined(X32)
/*
* i386 is the only personality on X86_64 and X32
* with 32-bit rlim_t.
* When current_personality is X32, current_wordsize
* equals to 4 but rlim_t is 64-bit.
*/
- if (current_personality == 1)
-# else
- if (current_wordsize == 4)
-# endif
+ if (current_klongsize == 4)
print_rlimit32(tcp, addr);
else
print_rlimit64(tcp, addr);
if (entering(tcp)) {
printxval(resources, tcp->u_arg[0], "RLIMIT_???");
tprints(", ");
- }
- else {
+ } else {
decode_rlimit(tcp, tcp->u_arg[1]);
}
return 0;
SYS_FUNC(prlimit64)
{
if (entering(tcp)) {
- tprintf("%ld, ", tcp->u_arg[0]);
+ tprintf("%d, ", (int) tcp->u_arg[0]);
printxval(resources, tcp->u_arg[1], "RLIMIT_???");
tprints(", ");
print_rlimit64(tcp, tcp->u_arg[2]);
if (entering(tcp)) {
printxval(usagewho, tcp->u_arg[0], "RUSAGE_???");
tprints(", ");
- }
- else
- MPERS_PRINTER_NAME(printrusage)(tcp, tcp->u_arg[1]);
+ } else
+ printrusage(tcp, tcp->u_arg[1]);
return 0;
}
if (entering(tcp)) {
printxval(usagewho, tcp->u_arg[0], "RUSAGE_???");
tprints(", ");
- }
- else
+ } else
printrusage32(tcp, tcp->u_arg[1]);
return 0;
}
SYS_FUNC(getpriority)
{
printxval(priorities, tcp->u_arg[0], "PRIO_???");
- tprintf(", %lu", tcp->u_arg[1]);
+ tprintf(", %d", (int) tcp->u_arg[1]);
return RVAL_DECODED;
}
SYS_FUNC(setpriority)
{
printxval(priorities, tcp->u_arg[0], "PRIO_???");
- tprintf(", %lu, %d", tcp->u_arg[1], (int) tcp->u_arg[2]);
+ tprintf(", %d, %d", (int) tcp->u_arg[1], (int) tcp->u_arg[2]);
return RVAL_DECODED;
}