diff options
author | Dmitry V. Levin <ldv@altlinux.org> | 2016-05-15 14:23:06 +0000 |
---|---|---|
committer | Dmitry V. Levin <ldv@altlinux.org> | 2016-05-15 14:23:06 +0000 |
commit | 6274ecc75223ea05abe838b3936b0616210f3a23 (patch) | |
tree | bf3f9b880ed0ed2b11a3bde3e4695b8fdc09329e | |
parent | c0db59b97bfa6820bbb5706832ab63d04a8c2659 (diff) | |
download | strace-6274ecc75223ea05abe838b3936b0616210f3a23.tar.gz |
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.
-rw-r--r-- | fcntl.c | 6 | ||||
-rw-r--r-- | membarrier.c | 3 | ||||
-rw-r--r-- | poll.c | 3 | ||||
-rw-r--r-- | prctl.c | 3 |
4 files changed, 10 insertions, 5 deletions
@@ -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) diff --git a/membarrier.c b/membarrier.c index 485c62a5a..3bc57648c 100644 --- a/membarrier.c +++ b/membarrier.c @@ -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; } @@ -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(", ], ..."))) { @@ -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: |