Prepare for transition from sprintflags64 to sprintflags

* fcntl.c (print_fcntl): Cast 3rd argument of sprintflags
to unsigned long.
* membarrier.c (SYS_FUNC(membarrier)): Likewise.
* prctl.c (SYS_FUNC(prctl)): Likewise.
* poll.c (decode_poll_exiting): Cast 3rd argument of sprintflags
to unsigned short.
This commit is contained in:
Дмитрий Левин 2016-05-15 14:23:06 +00:00
parent c0db59b97b
commit 6274ecc752
4 changed files with 10 additions and 5 deletions

View File

@ -140,7 +140,8 @@ print_fcntl(struct tcb *tcp)
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,
(unsigned long) tcp->u_rval);
return RVAL_HEX | RVAL_STR;
case F_GETFL:
if (entering(tcp) || syserror(tcp))
@ -173,7 +174,8 @@ print_fcntl(struct tcb *tcp)
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,
(unsigned long) tcp->u_rval);
return RVAL_HEX | RVAL_STR;
case F_GETSIG:
if (entering(tcp) || syserror(tcp) || tcp->u_rval == 0)

View File

@ -43,6 +43,7 @@ SYS_FUNC(membarrier)
if (syserror(tcp) || !tcp->u_rval)
return 0;
tcp->auxstr = sprintflags("", membarrier_cmds, tcp->u_rval);
tcp->auxstr = sprintflags("", membarrier_cmds,
(unsigned long) tcp->u_rval);
return RVAL_HEX | RVAL_STR;
}

3
poll.c
View File

@ -112,7 +112,8 @@ decode_poll_exiting(struct tcb *tcp, const long pts)
char fdstr[sizeof(fmt) + sizeof(int) * 3];
sprintf(fdstr, fmt, fds.fd);
const char *flagstr = sprintflags("", pollflags, fds.revents);
const char *flagstr = sprintflags("", pollflags,
(unsigned short) fds.revents);
if (outptr + strlen(fdstr) + strlen(flagstr) + 1 >=
end_outstr - (2 + 2 * sizeof(long) + sizeof(", ], ..."))) {

View File

@ -122,7 +122,8 @@ SYS_FUNC(prctl)
break;
if (syserror(tcp) || tcp->u_rval == 0)
return 0;
tcp->auxstr = sprintflags("", secbits, tcp->u_rval);
tcp->auxstr = sprintflags("", secbits,
(unsigned long) tcp->u_rval);
return RVAL_STR;
case PR_GET_TID_ADDRESS: