* 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
print_struct_flock64(const struct_kernel_flock64 *fl, const int getlk)
{
tprints("{l_type=");
- printxval(lockfcmds, fl->l_type, "F_???");
+ printxval(lockfcmds, (unsigned short) fl->l_type, "F_???");
tprints(", l_whence=");
- printxval(whence_codes, fl->l_whence, "SEEK_???");
- tprintf(", l_start=%Ld, l_len=%Ld",
- (long long) fl->l_start, (long long) fl->l_len);
+ printxval(whence_codes, (unsigned short) fl->l_whence, "SEEK_???");
+ tprintf(", l_start=%" PRId64 ", l_len=%" PRId64,
+ (int64_t) fl->l_start, (int64_t) fl->l_len);
if (getlk)
tprintf(", l_pid=%lu", (unsigned long) fl->l_pid);
tprints("}");
}
static void
-printflock64(struct tcb *tcp, const long addr, const int getlk)
+printflock64(struct tcb *const tcp, const kernel_ulong_t addr, const int getlk)
{
struct_kernel_flock64 fl;
}
static void
-printflock(struct tcb *tcp, const long addr, const int getlk)
+printflock(struct tcb *const tcp, const kernel_ulong_t addr, const int getlk)
{
struct_kernel_flock64 fl;
}
static void
-print_f_owner_ex(struct tcb *tcp, const long addr)
+print_f_owner_ex(struct tcb *const tcp, const kernel_ulong_t addr)
{
struct { int type, pid; } owner;
static int
print_fcntl(struct tcb *tcp)
{
- switch (tcp->u_arg[1]) {
+ const unsigned int cmd = tcp->u_arg[1];
+
+ switch (cmd) {
case F_SETFD:
tprints(", ");
printflags(fdflags, tcp->u_arg[2], "FD_???");
break;
case F_SETOWN:
case F_SETPIPE_SZ:
- tprintf(", %ld", tcp->u_arg[2]);
+ tprintf(", %" PRI_kld, tcp->u_arg[2]);
break;
case F_DUPFD:
case F_DUPFD_CLOEXEC:
- tprintf(", %ld", tcp->u_arg[2]);
+ tprintf(", %" PRI_kld, tcp->u_arg[2]);
return RVAL_DECODED | RVAL_FD;
case F_SETFL:
tprints(", ");
break;
case F_NOTIFY:
tprints(", ");
- printflags(notifyflags, tcp->u_arg[2], "DN_???");
+ printflags64(notifyflags, tcp->u_arg[2], "DN_???");
break;
case F_SETLEASE:
tprints(", ");
- printxval(lockfcmds, tcp->u_arg[2], "F_???");
+ printxval64(lockfcmds, tcp->u_arg[2], "F_???");
break;
case F_ADD_SEALS:
tprints(", ");
- printflags(f_seals, tcp->u_arg[2], "F_SEAL_???");
+ printflags64(f_seals, tcp->u_arg[2], "F_SEAL_???");
break;
case F_SETSIG:
tprints(", ");
case F_GETFD:
if (entering(tcp) || syserror(tcp) || tcp->u_rval == 0)
return 0;
- tcp->auxstr = sprintflags("flags ", fdflags, tcp->u_rval);
+ tcp->auxstr = sprintflags("flags ", fdflags,
+ (kernel_ulong_t) tcp->u_rval);
return RVAL_HEX | RVAL_STR;
case F_GETFL:
if (entering(tcp) || syserror(tcp))
case F_GETLEASE:
if (entering(tcp) || syserror(tcp))
return 0;
- tcp->auxstr = xlookup(lockfcmds, tcp->u_rval);
+ tcp->auxstr = xlookup(lockfcmds, (kernel_ulong_t) tcp->u_rval);
return RVAL_HEX | RVAL_STR;
case F_GET_SEALS:
if (entering(tcp) || syserror(tcp) || tcp->u_rval == 0)
return 0;
- tcp->auxstr = sprintflags("seals ", f_seals, tcp->u_rval);
+ tcp->auxstr = sprintflags("seals ", f_seals,
+ (kernel_ulong_t) tcp->u_rval);
return RVAL_HEX | RVAL_STR;
case F_GETSIG:
if (entering(tcp) || syserror(tcp) || tcp->u_rval == 0)
tcp->auxstr = signame(tcp->u_rval);
return RVAL_STR;
default:
- tprintf(", %#lx", tcp->u_arg[2]);
+ tprintf(", %#" PRI_klx, tcp->u_arg[2]);
break;
}
return RVAL_DECODED;
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
- const char *str = xlookup(fcntlcmds, tcp->u_arg[1]);
+ const unsigned int cmd = tcp->u_arg[1];
+ const char *str = xlookup(fcntlcmds, cmd);
if (str) {
tprints(str);
} else {
* constants, but we would like to show them
* for better debugging experience.
*/
- printxval(fcntl64cmds, tcp->u_arg[1], "F_???");
+ printxval(fcntl64cmds, cmd, "F_???");
}
}
return print_fcntl(tcp);
SYS_FUNC(fcntl64)
{
+ const unsigned int cmd = tcp->u_arg[1];
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
- const char *str = xlookup(fcntl64cmds, tcp->u_arg[1]);
+ const char *str = xlookup(fcntl64cmds, cmd);
if (str) {
tprints(str);
} else {
- printxval(fcntlcmds, tcp->u_arg[1], "F_???");
+ printxval(fcntlcmds, cmd, "F_???");
}
}
- switch (tcp->u_arg[1]) {
+ switch (cmd) {
case F_SETLK64:
case F_SETLKW64:
tprints(", ");