From 6274ecc75223ea05abe838b3936b0616210f3a23 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sun, 15 May 2016 14:23:06 +0000 Subject: [PATCH] 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. --- fcntl.c | 6 ++++-- membarrier.c | 3 ++- poll.c | 3 ++- prctl.c | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/fcntl.c b/fcntl.c index b30fc17b..e2a76f98 100644 --- a/fcntl.c +++ b/fcntl.c @@ -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 485c62a5..3bc57648 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; } diff --git a/poll.c b/poll.c index afe0493a..f116cef0 100644 --- a/poll.c +++ b/poll.c @@ -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(", ], ..."))) { diff --git a/prctl.c b/prctl.c index 4ddd0b91..a0b4e96c 100644 --- a/prctl.c +++ b/prctl.c @@ -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: -- 2.40.0