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.

diff --git a/fcntl.c b/fcntl.c
index b30fc17bcd0c9935ea5df3920079b0eeae199afb..e2a76f980870a6f9db5f9525edd43ea5b1ce556b 100644 (file)
--- 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 485c62a5a9b5604d3bd55682a418692d8b81c1a3..3bc57648c292f4c1c54ac75ff24b48807f9bdf4f 100644 (file)
--- 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 afe0493acdb1771331ce1f0b63f9bb7eae870e5f..f116cef056ea617a168a786a829ad4856f87417b 100644 (file)
--- 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 4ddd0b9190969f120e1c7f4749de6c7381920268..a0b4e96cd8f4cd784336697778535124bcf5ddea 100644 (file)
--- 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: