glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use printxval64 instead of printxval_long

Browse Source 
After the change of tcb.u_arg type from long to kernel_ureg_t it is safe
to stop using printxval_long proxy and pass syscall arguments directly
to printxval64.

* defs.h (printxval_long): Remove.
* fcntl.c (print_fcntl): Replace printxval_long with printxval64.
* mtd.c (mtd_ioctl): Likewise.
* numa.c (SYS_FUNC(mbind)): Likewise.
* or1k_atomic.c [OR1K] (SYS_FUNC(or1k_atomic)): Likewise.
* sysmips.c [MIPS] (SYS_FUNC(sysmips)): Likewise.
* term.c (term_ioctl): Likewise.
This commit is contained in:
Дмитрий Левин 2016-12-25 21:59:59 +00:00
parent 9f8b29f1cd
commit d69c27760c
7 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
defs.h
View File

@ -794,12 +794,6 @@ printxval(const struct xlat *x, const unsigned int val, const char *dflt)
return printxvals(val, dflt, x, NULL);
}
static inline int
printxval_long(const struct xlat *x, const unsigned long val, const char *dflt)
{
return printxvals(val, dflt, x, NULL);
}
static inline void
tprint_iov(struct tcb *tcp, kernel_ureg_t len, kernel_ureg_t addr,
enum iov_decode decode_iov)

2
fcntl.c
View File

@ -126,7 +126,7 @@ print_fcntl(struct tcb *tcp)
break;
case F_SETLEASE:
tprints(", ");
printxval_long(lockfcmds, tcp->u_arg[2], "F_???");
printxval64(lockfcmds, tcp->u_arg[2], "F_???");
break;
case F_ADD_SEALS:
tprints(", ");

2
mtd.c
View File

@ -285,7 +285,7 @@ MPERS_PRINTER_DECL(int, mtd_ioctl, struct tcb *const tcp,
case MTDFILEMODE:
tprints(", ");
printxval_long(mtd_file_mode_options, arg, "MTD_FILE_MODE_???");
printxval64(mtd_file_mode_options, arg, "MTD_FILE_MODE_???");
break;
case MEMGETBADBLOCK:

2
numa.c
View File

@ -78,7 +78,7 @@ SYS_FUNC(mbind)
{
printaddr(tcp->u_arg[0]);
tprintf(", %lu, ", tcp->u_arg[1]);
printxval_long(policies, tcp->u_arg[2], "MPOL_???");
printxval64(policies, tcp->u_arg[2], "MPOL_???");
tprints(", ");
print_nodemask(tcp, tcp->u_arg[3], tcp->u_arg[4]);
tprintf(", %lu, ", tcp->u_arg[4]);

2
or1k_atomic.c
View File

@ -44,7 +44,7 @@
SYS_FUNC(or1k_atomic)
{
printxval_long(atomic_ops, tcp->u_arg[0], "???");
printxval64(atomic_ops, tcp->u_arg[0], "???");
switch(tcp->u_arg[0]) {
case OR1K_ATOMIC_SWAP:
tprintf(", 0x%lx, 0x%lx", tcp->u_arg[1], tcp->u_arg[2]);

2
sysmips.c
View File

@ -45,7 +45,7 @@
SYS_FUNC(sysmips)
{
printxval_long(sysmips_operations, tcp->u_arg[0], "???");
printxval64(sysmips_operations, tcp->u_arg[0], "???");
tprints(", ");
switch (tcp->u_arg[0]) {

4
term.c
View File

@ -223,11 +223,11 @@ term_ioctl(struct tcb *const tcp, const unsigned int code,
/* ioctls with a direct decodable arg */
case TCXONC:
tprints(", ");
printxval_long(tcxonc_options, arg, "TC???");
printxval64(tcxonc_options, arg, "TC???");
break;
case TCFLSH:
tprints(", ");
printxval_long(tcflsh_options, arg, "TC???");
printxval64(tcflsh_options, arg, "TC???");
break;
case TCSBRK:
case TCSBRKP: