]> granicus.if.org Git - strace/commitdiff
Print kernel_ureg_t and kernel_scno_t using dedicated format strings
authorDmitry V. Levin <ldv@altlinux.org>
Mon, 26 Dec 2016 00:37:18 +0000 (00:37 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Mon, 26 Dec 2016 10:43:04 +0000 (10:43 +0000)
Prepare for the change of kernel_ureg_t and kernel_scno_t from
unsigned long to kernel_ulong_t.

* defs.h (PRI_krd, PRI_kru, PRI_krx): New temporary macros.
All users updated.

51 files changed:
block.c
clone.c
copy_file_range.c
defs.h
dirent.c
epoll.c
evdev.c
fcntl.c
fstatfs64.c
futex.c
getcwd.c
getrandom.c
hostname.c
io.c
ioctl.c
ioperm.c
ipc.c
ipc_msg.c
ipc_sem.c
ipc_shm.c
kexec.c
keyctl.c
ldt.c
linux/x86_64/get_scno.c
loop.c
mem.c
mmsghdr.c
msghdr.c
net.c
numa.c
poll.c
print_msgbuf.c
print_timespec.c
print_timeval.c
process.c
process_vm.c
ptp.c
readahead.c
readlink.c
rtc.c
sendfile.c
sigaltstack.c
signal.c
signalfd.c
statfs64.c
syscall.c
syslog.c
sysmips.c
truncate.c
util.c
xattr.c

diff --git a/block.c b/block.c
index b885839cfdfcd883ade79aafabba790024098d93..1864b5922fdb00e04e31a605b326f60345b8b58f 100644 (file)
--- a/block.c
+++ b/block.c
@@ -150,7 +150,7 @@ MPERS_PRINTER_DECL(int, block_ioctl, struct tcb *const tcp,
        /* take arg as a value, not as a pointer */
        case BLKRASET:
        case BLKFRASET:
-               tprintf(", %lu", arg);
+               tprintf(", %" PRI_kru, arg);
                break;
 
        /* return an unsigned short */
diff --git a/clone.c b/clone.c
index 81b1ba0de59af4aa573512ac9cbfcd3651c0033f..822891112e4c93408aa0e9cfb1af5e0795ba54e3 100644 (file)
--- a/clone.c
+++ b/clone.c
@@ -104,7 +104,7 @@ SYS_FUNC(clone)
                tprints(", ");
 #ifdef ARG_STACKSIZE
                if (ARG_STACKSIZE != -1)
-                       tprintf("stack_size=%#lx, ",
+                       tprintf("stack_size=%#" PRI_krx ", ",
                                tcp->u_arg[ARG_STACKSIZE]);
 #endif
                tprints("flags=");
index 8e711d1e09b881831705d33f3dc9d28696963e78..aa84486080cdc2ece11fddeca22634541149d9c8 100644 (file)
@@ -42,7 +42,7 @@ SYS_FUNC(copy_file_range)
        printnum_int64(tcp, tcp->u_arg[3], "%" PRId64);
        tprints(", ");
        /* size_t len */
-       tprintf("%lu, ", tcp->u_arg[4]);
+       tprintf("%" PRI_kru ", ", tcp->u_arg[4]);
        /* unsigned int flags */
        tprintf("%u", (unsigned int) tcp->u_arg[5]);
 
diff --git a/defs.h b/defs.h
index 2b31350875732707b032fd5cd83d7117484b3256..516f57b8dd1e17a91a7e8a5c4488fe57120b08d9 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -985,6 +985,10 @@ scno_is_valid(kernel_scno_t scno)
 #define PRI_klu PRI_kl"u"
 #define PRI_klx PRI_kl"x"
 
+#define PRI_krd "ld"
+#define PRI_kru "lu"
+#define PRI_krx "lx"
+
 /*
  * The kernel used to define 64-bit types on 64-bit systems on a per-arch
  * basis.  Some architectures would use unsigned long and others would use
index 07bfec75682c4ce401be18aa30e96aa490d77e7f..1a58debbb88e9bc8dc2a309c00040038b9d8c135 100644 (file)
--- a/dirent.c
+++ b/dirent.c
@@ -66,7 +66,7 @@ SYS_FUNC(readdir)
                        print_old_dirent(tcp, tcp->u_arg[1]);
                /* Not much point in printing this out, it is always 1. */
                if (tcp->u_arg[2] != 1)
-                       tprintf(", %lu", tcp->u_arg[2]);
+                       tprintf(", %" PRI_kru, tcp->u_arg[2]);
        }
        return 0;
 }
diff --git a/epoll.c b/epoll.c
index 7382e0c0af6bb18e3aeb9db2fd725129f3448912..e0a58f6889f618eaa14d149c025edb87f2b7a727 100644 (file)
--- a/epoll.c
+++ b/epoll.c
@@ -111,7 +111,7 @@ SYS_FUNC(epoll_pwait)
                tprints(", ");
                /* NB: kernel requires arg[5] == NSIG / 8 */
                print_sigset_addr_len(tcp, tcp->u_arg[4], tcp->u_arg[5]);
-               tprintf(", %lu", tcp->u_arg[5]);
+               tprintf(", %" PRI_kru, tcp->u_arg[5]);
        }
        return 0;
 }
diff --git a/evdev.c b/evdev.c
index 94842ba3d3131bb57566178cfae417a73c529265..9127bf692dab8dd069036d929e214242f3e9d653 100644 (file)
--- a/evdev.c
+++ b/evdev.c
@@ -497,7 +497,7 @@ evdev_write_ioctl(struct tcb *const tcp, const unsigned int code,
 # ifdef EVIOCREVOKE
                case EVIOCREVOKE:
 # endif
-                       tprintf(", %lu", arg);
+                       tprintf(", %" PRI_kru, arg);
                        return 1;
 # ifdef EVIOCSCLOCKID
                case EVIOCSCLOCKID:
diff --git a/fcntl.c b/fcntl.c
index 948862927f5698f93ab1550643bb8f19bc8ec228..c7da7f00c69f3198b15205b57d13ee0f51259447 100644 (file)
--- a/fcntl.c
+++ b/fcntl.c
@@ -96,11 +96,11 @@ print_fcntl(struct tcb *tcp)
                break;
        case F_SETOWN:
        case F_SETPIPE_SZ:
-               tprintf(", %ld", tcp->u_arg[2]);
+               tprintf(", %" PRI_krd, tcp->u_arg[2]);
                break;
        case F_DUPFD:
        case F_DUPFD_CLOEXEC:
-               tprintf(", %ld", tcp->u_arg[2]);
+               tprintf(", %" PRI_krd, tcp->u_arg[2]);
                return RVAL_DECODED | RVAL_FD;
        case F_SETFL:
                tprints(", ");
@@ -185,7 +185,7 @@ print_fcntl(struct tcb *tcp)
                tcp->auxstr = signame(tcp->u_rval);
                return RVAL_STR;
        default:
-               tprintf(", %#lx", tcp->u_arg[2]);
+               tprintf(", %#" PRI_krx, tcp->u_arg[2]);
                break;
        }
        return RVAL_DECODED;
index 268047c38e1c1260fb70ec519bd107e9513d580e..da50240ad671ebc0f32501b637a0953fb392a800 100644 (file)
@@ -4,7 +4,7 @@ SYS_FUNC(fstatfs64)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", %lu, ", tcp->u_arg[1]);
+               tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
        } else {
                print_struct_statfs64(tcp, tcp->u_arg[2], tcp->u_arg[1]);
        }
diff --git a/futex.c b/futex.c
index ff91ab706108a442b1c0251530c4e72940a1767d..2d1e1ada4946ba1bd645424595ead364df046175 100644 (file)
--- a/futex.c
+++ b/futex.c
@@ -121,7 +121,8 @@ SYS_FUNC(futex)
                break;
        default:
                tprintf(", %u", val);
-               tprintf(", %#lx", timeout);
+               tprints(", ");
+               printaddr(timeout);
                tprints(", ");
                printaddr(uaddr2);
                tprintf(", %#x", val3);
index 329762397ede99a1231d82fff09d889743625427..a3b2bf1f0f255d546f3c6110c589743a3352ab01 100644 (file)
--- a/getcwd.c
+++ b/getcwd.c
@@ -7,7 +7,7 @@ SYS_FUNC(getcwd)
                        printaddr(tcp->u_arg[0]);
                else
                        printpathn(tcp, tcp->u_arg[0], tcp->u_rval - 1);
-               tprintf(", %lu", tcp->u_arg[1]);
+               tprintf(", %" PRI_kru, tcp->u_arg[1]);
        }
        return 0;
 }
index c82d39c8e081178372611545fe0dfecdc072f12b..10d0941317cc669e2475d7848136e1390849c3ac 100644 (file)
@@ -8,7 +8,7 @@ SYS_FUNC(getrandom)
                        printaddr(tcp->u_arg[0]);
                else
                        printstrn(tcp, tcp->u_arg[0], tcp->u_rval);
-               tprintf(", %lu, ", tcp->u_arg[1]);
+               tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
                printflags(getrandom_flags, tcp->u_arg[2], "GRND_???");
        }
        return 0;
index 394fdf605129000b9611db08acd1252d3e09578e..f852faa485ecbf89184ae2ccdd6913261e19bc9d 100644 (file)
@@ -31,7 +31,7 @@ SYS_FUNC(gethostname)
                        printaddr(tcp->u_arg[0]);
                else
                        printstr(tcp, tcp->u_arg[0]);
-               tprintf(", %lu", tcp->u_arg[1]);
+               tprintf(", %" PRI_kru, tcp->u_arg[1]);
        }
        return 0;
 }
diff --git a/io.c b/io.c
index 28fe74ee94bf06ed5bc546b2fdc48973959015d2..5e44721ea1fe1b8cd488ce6b87c7607b1714c22a 100644 (file)
--- a/io.c
+++ b/io.c
@@ -42,7 +42,7 @@ SYS_FUNC(read)
                        printaddr(tcp->u_arg[1]);
                else
                        printstrn(tcp, tcp->u_arg[1], tcp->u_rval);
-               tprintf(", %lu", tcp->u_arg[2]);
+               tprintf(", %" PRI_kru, tcp->u_arg[2]);
        }
        return 0;
 }
@@ -52,7 +52,7 @@ SYS_FUNC(write)
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
        printstrn(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       tprintf(", %lu", tcp->u_arg[2]);
+       tprintf(", %" PRI_kru, tcp->u_arg[2]);
 
        return RVAL_DECODED;
 }
@@ -101,7 +101,7 @@ print_iovec(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
                        break;
        }
 
-       tprintf(", iov_len=%lu}", iov[1]);
+       tprintf(", iov_len=%" PRI_kru "}", iov[1]);
 
        return true;
 }
@@ -132,7 +132,7 @@ SYS_FUNC(readv)
                tprint_iov_upto(tcp, tcp->u_arg[2], tcp->u_arg[1],
                                syserror(tcp) ? IOV_DECODE_ADDR :
                                IOV_DECODE_STR, tcp->u_rval);
-               tprintf(", %lu", tcp->u_arg[2]);
+               tprintf(", %" PRI_kru, tcp->u_arg[2]);
        }
        return 0;
 }
@@ -142,7 +142,7 @@ SYS_FUNC(writev)
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
        tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], IOV_DECODE_STR);
-       tprintf(", %lu", tcp->u_arg[2]);
+       tprintf(", %" PRI_kru, tcp->u_arg[2]);
 
        return RVAL_DECODED;
 }
@@ -157,7 +157,7 @@ SYS_FUNC(pread)
                        printaddr(tcp->u_arg[1]);
                else
                        printstrn(tcp, tcp->u_arg[1], tcp->u_rval);
-               tprintf(", %lu, ", tcp->u_arg[2]);
+               tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
                printllval(tcp, "%lld", 3);
        }
        return 0;
@@ -168,7 +168,7 @@ SYS_FUNC(pwrite)
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
        printstrn(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       tprintf(", %lu, ", tcp->u_arg[2]);
+       tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
        printllval(tcp, "%lld", 3);
 
        return RVAL_DECODED;
@@ -180,12 +180,12 @@ print_lld_from_low_high_val(struct tcb *tcp, int arg)
 #if SIZEOF_LONG > 4 && SIZEOF_LONG == SIZEOF_LONG_LONG
 # ifndef current_klongsize
        if (current_klongsize < SIZEOF_LONG) {
-               tprintf("%ld", (tcp->u_arg[arg + 1] << current_wordsize * 8)
+               tprintf("%" PRI_krd, (tcp->u_arg[arg + 1] << current_wordsize * 8)
                               | tcp->u_arg[arg]);
        } else
 # endif /* !current_klongsize */
        {
-               tprintf("%ld", tcp->u_arg[arg]);
+               tprintf("%" PRI_krd, tcp->u_arg[arg]);
        }
 #elif SIZEOF_LONG > 4
 # error Unsupported configuration: SIZEOF_LONG > 4 && SIZEOF_LONG_LONG > SIZEOF_LONG
@@ -280,7 +280,7 @@ SYS_FUNC(tee)
        printfd(tcp, tcp->u_arg[1]);
        tprints(", ");
        /* size_t len */
-       tprintf("%lu, ", tcp->u_arg[2]);
+       tprintf("%" PRI_kru ", ", tcp->u_arg[2]);
        /* unsigned int flags */
        printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
 
@@ -302,7 +302,7 @@ SYS_FUNC(splice)
        printnum_int64(tcp, tcp->u_arg[3], "%" PRId64);
        tprints(", ");
        /* size_t len */
-       tprintf("%lu, ", tcp->u_arg[4]);
+       tprintf("%" PRI_kru ", ", tcp->u_arg[4]);
        /* unsigned int flags */
        printflags(splice_flags, tcp->u_arg[5], "SPLICE_F_???");
 
@@ -316,7 +316,7 @@ SYS_FUNC(vmsplice)
        tprints(", ");
        /* const struct iovec *iov, unsigned long nr_segs */
        tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], IOV_DECODE_STR);
-       tprintf(", %lu, ", tcp->u_arg[2]);
+       tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
        /* unsigned int flags */
        printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
 
diff --git a/ioctl.c b/ioctl.c
index 5f6b45950ccb45b5a11c838b85e556da4ba95038..19d5ec3b0eeba08a839932c0f5a0e0b110360ee8 100644 (file)
--- a/ioctl.c
+++ b/ioctl.c
@@ -323,7 +323,7 @@ SYS_FUNC(ioctl)
                if (ret)
                        --ret;
                else
-                       tprintf(", %#lx", tcp->u_arg[2]);
+                       tprintf(", %#" PRI_krx, tcp->u_arg[2]);
                ret |= RVAL_DECODED;
        } else {
                if (ret)
index 1a92a26311c54394bd0871b1523f1a7e715a9b51..1dad0e3360ea231fb1f6d96928c197bcc84bae8e 100644 (file)
--- a/ioperm.c
+++ b/ioperm.c
@@ -2,7 +2,7 @@
 
 SYS_FUNC(ioperm)
 {
-       tprintf("%#lx, %#lx, %d",
+       tprintf("%#" PRI_krx ", %#" PRI_krx ", %d",
                tcp->u_arg[0], tcp->u_arg[1], (int) tcp->u_arg[2]);
 
        return RVAL_DECODED;
diff --git a/ipc.c b/ipc.c
index 00a9d0d3e3c2aeeae0f8bad89502ea250a438e11..0e1870dcb558d455b32e2368fc2053718e644abd 100644 (file)
--- a/ipc.c
+++ b/ipc.c
@@ -45,7 +45,7 @@ SYS_FUNC(ipc)
 
        unsigned int i;
        for (i = 1; i < tcp->s_ent->nargs; ++i)
-               tprintf(", %#lx", tcp->u_arg[i]);
+               tprintf(", %#" PRI_krx, tcp->u_arg[i]);
 
        return RVAL_DECODED;
 }
index d12be3451e41c7273c380bad52723f51149a95c8..7016fec4deeed53f40970d7751369f5cec234ebf 100644 (file)
--- a/ipc_msg.c
+++ b/ipc_msg.c
@@ -82,7 +82,7 @@ tprint_msgrcv(struct tcb *const tcp, const kernel_ureg_t addr,
              const kernel_ureg_t count, const kernel_ureg_t msgtyp)
 {
        tprint_msgbuf(tcp, addr, count);
-       tprintf("%ld, ", msgtyp);
+       tprintf("%" PRI_krd ", ", msgtyp);
 }
 
 static int
@@ -121,7 +121,7 @@ SYS_FUNC(msgrcv)
                                kernel_ureg_t pair[2];
 
                                if (fetch_msgrcv_args(tcp, tcp->u_arg[3], pair))
-                                       tprintf(", %lu, ", tcp->u_arg[1]);
+                                       tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
                                else
                                        tprint_msgrcv(tcp, pair[0],
                                                      tcp->u_arg[1], pair[1]);
index f4b83f623058d76635c4846e99088ff73b1c0321..101d0eca4e32b541443a82766c9d34d9e29f31e6 100644 (file)
--- a/ipc_sem.c
+++ b/ipc_sem.c
@@ -126,7 +126,7 @@ SYS_FUNC(semctl)
           ) {
                printnum_ptr(tcp, tcp->u_arg[3]);
        } else {
-               tprintf("%#lx", tcp->u_arg[3]);
+               tprintf("%#" PRI_krx, tcp->u_arg[3]);
        }
        return RVAL_DECODED;
 }
index f9a053744d4083ff1777fc5df99e75b7b87906c3..a4f022500ebfa0edd4295f2a3ce71397f1750015 100644 (file)
--- a/ipc_shm.c
+++ b/ipc_shm.c
@@ -48,7 +48,7 @@ SYS_FUNC(shmget)
                tprintf("%#x", key);
        else
                tprints("IPC_PRIVATE");
-       tprintf(", %lu, ", tcp->u_arg[1]);
+       tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
        if (printflags(shm_resource_flags, tcp->u_arg[2] & ~0777, NULL) != 0)
                tprints("|");
        print_numeric_umode_t(tcp->u_arg[2] & 0777);
diff --git a/kexec.c b/kexec.c
index f746a46bda42edfc5c4e3dc9081dd3bec18ba2f7..fe11723319b8c1972ad45656d5eb11c11dec488c 100644 (file)
--- a/kexec.c
+++ b/kexec.c
@@ -55,9 +55,9 @@ print_seg(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 
        tprints("{buf=");
        printaddr(seg[0]);
-       tprintf(", bufsz=%lu, mem=", seg[1]);
+       tprintf(", bufsz=%" PRI_kru ", mem=", seg[1]);
        printaddr(seg[2]);
-       tprintf(", memsz=%lu}", seg[3]);
+       tprintf(", memsz=%" PRI_kru "}", seg[3]);
 
        return true;
 }
@@ -82,7 +82,7 @@ SYS_FUNC(kexec_load)
 {
        /* entry, nr_segments */
        printaddr(tcp->u_arg[0]);
-       tprintf(", %lu, ", tcp->u_arg[1]);
+       tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
 
        /* segments */
        print_kexec_segments(tcp, tcp->u_arg[2], tcp->u_arg[1]);
index 38a120e22a2cb3624cd64a40ee6344eaa51ca2bd..44ec827b79b1875e0dbceff02db622ae9e94dae5 100644 (file)
--- a/keyctl.c
+++ b/keyctl.c
@@ -59,7 +59,7 @@ SYS_FUNC(add_key)
        tprints(", ");
        printstrn(tcp, tcp->u_arg[2], tcp->u_arg[3]);
        /* payload length */
-       tprintf(", %lu, ", tcp->u_arg[3]);
+       tprintf(", %" PRI_kru ", ", tcp->u_arg[3]);
        /* keyring serial number */
        print_keyring_serial_number(tcp->u_arg[4]);
 
diff --git a/ldt.c b/ldt.c
index 655e96a28efe36f4e05f78cf79036057a0aaec3a..b7889fb67f1f181ebaa4d89985c5ad0a98878bbc 100644 (file)
--- a/ldt.c
+++ b/ldt.c
@@ -67,12 +67,12 @@ print_user_desc(struct tcb *const tcp, const kernel_ureg_t addr)
 
 SYS_FUNC(modify_ldt)
 {
-       tprintf("%ld, ", tcp->u_arg[0]);
+       tprintf("%" PRI_krd ", ", tcp->u_arg[0]);
        if (tcp->u_arg[2] != sizeof(struct user_desc))
                printaddr(tcp->u_arg[1]);
        else
                print_user_desc(tcp, tcp->u_arg[1]);
-       tprintf(", %lu", tcp->u_arg[2]);
+       tprintf(", %" PRI_kru, tcp->u_arg[2]);
 
        return RVAL_DECODED;
 }
index cbde17be7763fd70a47b186cade4df0e580e8ec9..45e3cb27743aa48efe1590e56ed87126f5b57a23 100644 (file)
@@ -141,7 +141,7 @@ arch_get_scno(struct tcb *tcp)
         * Stracing of i386 apps is still supported.
         */
        if (currpers == 0) {
-               error_msg("syscall_%lu(...) in unsupported "
+               error_msg("syscall_%" PRI_kru "(...) in unsupported "
                          "64-bit mode of process PID=%d", scno, tcp->pid);
                return 0;
        }
diff --git a/loop.c b/loop.c
index a9d7659a303f599cacab5621fdf892b0ea636233..cccc014316c2aad819d0cb198b2ae09cf953dd7a 100644 (file)
--- a/loop.c
+++ b/loop.c
@@ -190,7 +190,7 @@ loop_ioctl(struct tcb *const tcp, const unsigned int code,
 
 #ifdef LOOP_SET_DIRECT_IO
        case LOOP_SET_DIRECT_IO:
-               tprintf(", %lu", arg);
+               tprintf(", %" PRI_kru, arg);
                break;
 #endif
 
diff --git a/mem.c b/mem.c
index 4c4377eae7ca651f0c4956f3f7e7a823798ea50a..9ce867ac3ac6f6553346220e31609e65fcd8f258 100644 (file)
--- a/mem.c
+++ b/mem.c
@@ -64,7 +64,7 @@ print_mmap(struct tcb *tcp, kernel_ureg_t *u_arg, unsigned long long offset)
        const int fd = u_arg[4];
 
        printaddr(addr);
-       tprintf(", %lu, ", len);
+       tprintf(", %" PRI_kru ", ", len);
        printflags64(mmap_prot, prot, "PROT_???");
        tprints(", ");
 #ifdef MAP_TYPE
@@ -177,7 +177,7 @@ SYS_FUNC(mmap_4koff)
 SYS_FUNC(munmap)
 {
        printaddr(tcp->u_arg[0]);
-       tprintf(", %lu", tcp->u_arg[1]);
+       tprintf(", %" PRI_kru, tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }
@@ -210,7 +210,7 @@ SYS_FUNC(pkey_mprotect)
 SYS_FUNC(mremap)
 {
        printaddr(tcp->u_arg[0]);
-       tprintf(", %lu, %lu, ", tcp->u_arg[1], tcp->u_arg[2]);
+       tprintf(", %" PRI_kru ", %" PRI_kru ", ", tcp->u_arg[1], tcp->u_arg[2]);
        printflags64(mremap_flags, tcp->u_arg[3], "MREMAP_???");
 #ifdef MREMAP_FIXED
        if ((tcp->u_arg[3] & (MREMAP_MAYMOVE | MREMAP_FIXED)) ==
@@ -227,7 +227,7 @@ SYS_FUNC(mremap)
 SYS_FUNC(madvise)
 {
        printaddr(tcp->u_arg[0]);
-       tprintf(", %lu, ", tcp->u_arg[1]);
+       tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
        printxval(madvise_cmds, tcp->u_arg[2], "MADV_???");
 
        return RVAL_DECODED;
@@ -249,7 +249,7 @@ SYS_FUNC(msync)
        /* addr */
        printaddr(tcp->u_arg[0]);
        /* len */
-       tprintf(", %lu, ", tcp->u_arg[1]);
+       tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
        /* flags */
        printflags(mctl_sync, tcp->u_arg[2], "MS_???");
 
@@ -261,7 +261,7 @@ SYS_FUNC(msync)
 SYS_FUNC(mlock2)
 {
        printaddr(tcp->u_arg[0]);
-       tprintf(", %lu, ", tcp->u_arg[1]);
+       tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
        printflags(mlock_flags, tcp->u_arg[2], "MLOCK_???");
 
        return RVAL_DECODED;
@@ -271,7 +271,7 @@ SYS_FUNC(mincore)
 {
        if (entering(tcp)) {
                printaddr(tcp->u_arg[0]);
-               tprintf(", %lu, ", tcp->u_arg[1]);
+               tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
        } else {
                const unsigned long page_size = get_pagesize();
                const unsigned long page_mask = page_size - 1;
@@ -319,9 +319,9 @@ SYS_FUNC(remap_file_pages)
        const kernel_ureg_t flags = tcp->u_arg[4];
 
        printaddr(addr);
-       tprintf(", %lu, ", size);
+       tprintf(", %" PRI_kru ", ", size);
        printflags64(mmap_prot, prot, "PROT_???");
-       tprintf(", %lu, ", pgoff);
+       tprintf(", %" PRI_kru ", ", pgoff);
 #ifdef MAP_TYPE
        printxval64(mmap_flags, flags & MAP_TYPE, "MAP_???");
        addflags(mmap_flags, flags & ~MAP_TYPE);
@@ -349,7 +349,7 @@ SYS_FUNC(subpage_prot)
        kernel_ureg_t map = tcp->u_arg[2];
 
        printaddr(addr);
-       tprintf(", %lu, ", len);
+       tprintf(", %" PRI_kru ", ", len);
 
        unsigned int entry;
        print_array(tcp, map, nmemb, &entry, sizeof(entry),
index 94fee4070171957b49d6bea04ce5cc853d0ca47e..ac9327c2ebc7d504f349b0009f7429ce185ea48a 100644 (file)
--- a/mmsghdr.c
+++ b/mmsghdr.c
@@ -159,7 +159,7 @@ dumpiov_in_mmsghdr(struct tcb *const tcp, kernel_ureg_t addr)
                fetched = fetch_struct_mmsghdr(tcp, addr, &mmsg);
                if (!fetched)
                        break;
-               tprintf(" = %lu buffers in vector %u\n",
+               tprintf(" = %" PRI_kru " buffers in vector %u\n",
                        (kernel_ureg_t) mmsg.msg_hdr.msg_iovlen, i);
                dumpiov_upto(tcp, mmsg.msg_hdr.msg_iovlen,
                             ptr_to_kulong(mmsg.msg_hdr.msg_iov),
index 7a830b9523b04b2c831e85102bb59e95bf3a111d..3aba6427d4e2fe8f6e5ae7a21a24ae8640ff2373 100644 (file)
--- a/msghdr.c
+++ b/msghdr.c
@@ -297,7 +297,7 @@ decode_msg_control(struct tcb *const tcp, const kernel_ureg_t addr,
 
                if (u.ptr != buf)
                        tprints(", ");
-               tprintf("{cmsg_len=%lu, cmsg_level=", (unsigned long) cmsg_len);
+               tprintf("{cmsg_len=%" PRI_kru ", cmsg_level=", cmsg_len);
                printxval(socketlayers, cmsg_level, "SOL_???");
                tprints(", cmsg_type=");
 
@@ -355,11 +355,11 @@ print_struct_msghdr(struct tcb *tcp, const struct msghdr *msg,
 
        tprint_iov_upto(tcp, msg->msg_iovlen,
                        ptr_to_kulong(msg->msg_iov), decode, data_size);
-       tprintf(", msg_iovlen=%lu", (kernel_ureg_t) msg->msg_iovlen);
+       tprintf(", msg_iovlen=%" PRI_kru, (kernel_ureg_t) msg->msg_iovlen);
 
        decode_msg_control(tcp, ptr_to_kulong(msg->msg_control),
                           msg->msg_controllen);
-       tprintf(", msg_controllen=%lu", (kernel_ureg_t) msg->msg_controllen);
+       tprintf(", msg_controllen=%" PRI_kru, (kernel_ureg_t) msg->msg_controllen);
 
        tprints(", msg_flags=");
        printflags(msg_flags, msg->msg_flags, "MSG_???");
diff --git a/net.c b/net.c
index 63ffe52e025cc08377098400f4b89ed89a905f52..54eb116133d808ab190bea7ba3f413c10bef2a03 100644 (file)
--- a/net.c
+++ b/net.c
@@ -159,7 +159,7 @@ SYS_FUNC(socket)
 #endif
 
        default:
-               tprintf("%lu", tcp->u_arg[2]);
+               tprintf("%" PRI_kru, tcp->u_arg[2]);
                break;
        }
 
@@ -181,7 +181,7 @@ SYS_FUNC(listen)
 {
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
-       tprintf("%lu", tcp->u_arg[1]);
+       tprintf("%" PRI_kru, tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }
@@ -251,7 +251,7 @@ SYS_FUNC(send)
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
        decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1], tcp->u_arg[2]);
-       tprintf(", %lu, ", tcp->u_arg[2]);
+       tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
        /* flags */
        printflags(msg_flags, tcp->u_arg[3], "MSG_???");
 
@@ -263,7 +263,7 @@ SYS_FUNC(sendto)
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
        decode_sockbuf(tcp, tcp->u_arg[0], tcp->u_arg[1], tcp->u_arg[2]);
-       tprintf(", %lu, ", tcp->u_arg[2]);
+       tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
        /* flags */
        printflags(msg_flags, tcp->u_arg[3], "MSG_???");
        /* to address */
@@ -289,7 +289,7 @@ SYS_FUNC(recv)
                                     tcp->u_rval);
                }
 
-               tprintf(", %lu, ", tcp->u_arg[2]);
+               tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
                printflags(msg_flags, tcp->u_arg[3], "MSG_???");
        }
        return 0;
@@ -314,7 +314,7 @@ SYS_FUNC(recvfrom)
                                     tcp->u_rval);
                }
                /* size */
-               tprintf(", %lu, ", tcp->u_arg[2]);
+               tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
                /* flags */
                printflags(msg_flags, tcp->u_arg[3], "MSG_???");
                tprints(", ");
@@ -419,7 +419,7 @@ SYS_FUNC(socketpair)
                printxval(addrfams, tcp->u_arg[0], "AF_???");
                tprints(", ");
                tprint_sock_type(tcp->u_arg[1]);
-               tprintf(", %lu", tcp->u_arg[2]);
+               tprintf(", %" PRI_kru, tcp->u_arg[2]);
        } else {
                tprints(", ");
                decode_pair_fd(tcp, tcp->u_arg[3]);
diff --git a/numa.c b/numa.c
index c05a3a6001d5c724e10e0475b41b629f4c787cd8..25031cb4578a126d57248ba5df11b4a9522620f9 100644 (file)
--- a/numa.c
+++ b/numa.c
@@ -35,7 +35,7 @@ print_node(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
                tprintf("%#0*x", (int) elem_size * 2 + 2,
                        * (unsigned int *) elem_buf);
        } else {
-               tprintf("%#0*lx", (int) elem_size * 2 + 2,
+               tprintf("%#0*" PRI_krx, (int) elem_size * 2 + 2,
                        * (kernel_ureg_t *) elem_buf);
        }
 
@@ -63,7 +63,7 @@ print_nodemask(struct tcb *const tcp, const kernel_ureg_t addr,
 
 SYS_FUNC(migrate_pages)
 {
-       tprintf("%d, %lu, ", (int) tcp->u_arg[0], tcp->u_arg[1]);
+       tprintf("%d, %" PRI_kru ", ", (int) tcp->u_arg[0], tcp->u_arg[1]);
        print_nodemask(tcp, tcp->u_arg[2], tcp->u_arg[1]);
        tprints(", ");
        print_nodemask(tcp, tcp->u_arg[3], tcp->u_arg[1]);
@@ -77,11 +77,11 @@ SYS_FUNC(migrate_pages)
 SYS_FUNC(mbind)
 {
        printaddr(tcp->u_arg[0]);
-       tprintf(", %lu, ", tcp->u_arg[1]);
+       tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
        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]);
+       tprintf(", %" PRI_kru ", ", tcp->u_arg[4]);
        printflags(mbindflags, tcp->u_arg[5], "MPOL_???");
 
        return RVAL_DECODED;
@@ -92,7 +92,7 @@ SYS_FUNC(set_mempolicy)
        printxval(policies, tcp->u_arg[0], "MPOL_???");
        tprints(", ");
        print_nodemask(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       tprintf(", %lu", tcp->u_arg[2]);
+       tprintf(", %" PRI_kru, tcp->u_arg[2]);
 
        return RVAL_DECODED;
 }
@@ -110,7 +110,7 @@ SYS_FUNC(get_mempolicy)
                }
                tprints(", ");
                print_nodemask(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, ", tcp->u_arg[2]);
+               tprintf(", %" PRI_kru ", ", tcp->u_arg[2]);
                printaddr(tcp->u_arg[3]);
                tprints(", ");
                printflags64(mempolicyflags, tcp->u_arg[4], "MPOL_???");
@@ -163,7 +163,7 @@ SYS_FUNC(move_pages)
        kernel_ureg_t buf;
 
        if (entering(tcp)) {
-               tprintf("%d, %lu, ", (int) tcp->u_arg[0], npages);
+               tprintf("%d, %" PRI_kru ", ", (int) tcp->u_arg[0], npages);
                print_array(tcp, tcp->u_arg[2], npages, &buf, current_wordsize,
                            umoven_or_printaddr, print_addr, 0);
                tprints(", ");
diff --git a/poll.c b/poll.c
index 147f6b1a3d368b833402dd2e14a879f83078ee83..1267cfbbb2752a407f3e6e04470a1096f8b958d9 100644 (file)
--- a/poll.c
+++ b/poll.c
@@ -95,7 +95,7 @@ decode_poll_exiting(struct tcb *const tcp, const kernel_ureg_t pts)
                                *outptr++ = '[';
                        else
                                outptr = stpcpy(outptr, ", ");
-                       outptr += sprintf(outptr, "%#lx", cur);
+                       outptr += sprintf(outptr, "%#" PRI_krx, cur);
                        break;
                }
                if (!fds.revents)
@@ -178,7 +178,7 @@ SYS_FUNC(ppoll)
                tprints(", ");
                /* NB: kernel requires arg[4] == NSIG / 8 */
                print_sigset_addr_len(tcp, tcp->u_arg[3], tcp->u_arg[4]);
-               tprintf(", %lu", tcp->u_arg[4]);
+               tprintf(", %" PRI_kru, tcp->u_arg[4]);
 
                return 0;
        } else {
index 733f0198780405abee4149a9fc1c46bd3bdd9d60..3695135cd6731f1f98d0bcbb9d60f57096ecc7e9 100644 (file)
@@ -48,5 +48,5 @@ MPERS_PRINTER_DECL(void, tprint_msgbuf, struct tcb *const tcp,
                printstrn(tcp, addr + sizeof(msg.mtype), count);
                tprints("}");
        }
-       tprintf(", %lu, ", count);
+       tprintf(", %" PRI_kru ", ", count);
 }
index 209016df53c485e26801c5f9a2fa9b4acd120627..e005ca993bccc7029b34c8fedbe765fd3111701b 100644 (file)
@@ -85,7 +85,7 @@ MPERS_PRINTER_DECL(const char *, sprint_timespec,
                strcpy(buf, "NULL");
        } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
                   umove(tcp, addr, &t)) {
-               snprintf(buf, sizeof(buf), "%#lx", addr);
+               snprintf(buf, sizeof(buf), "%#" PRI_krx, addr);
        } else {
                snprintf(buf, sizeof(buf), timespec_fmt,
                         (intmax_t) t.tv_sec, (intmax_t) t.tv_nsec);
index de4580f03915f79f6f31f3cdd35ca1768901dc8a..be49ff34ec5e1135e1cb48c19494cbf3388a249a 100644 (file)
@@ -86,7 +86,7 @@ MPERS_PRINTER_DECL(const char *, sprint_timeval,
                strcpy(buf, "NULL");
        } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
                   umove(tcp, addr, &t)) {
-               snprintf(buf, sizeof(buf), "%#lx", addr);
+               snprintf(buf, sizeof(buf), "%#" PRI_krx, addr);
        } else {
                snprintf(buf, sizeof(buf), timeval_fmt,
                         (intmax_t) t.tv_sec, (intmax_t) t.tv_usec);
@@ -169,7 +169,7 @@ sprint_timeval32(struct tcb *const tcp, const kernel_ureg_t addr)
                strcpy(buf, "NULL");
        } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
                   umove(tcp, addr, &t)) {
-               snprintf(buf, sizeof(buf), "%#lx", addr);
+               snprintf(buf, sizeof(buf), "%#" PRI_krx, addr);
        } else {
                snprintf(buf, sizeof(buf), timeval_fmt,
                         (intmax_t) t.tv_sec, (intmax_t) t.tv_usec);
index dac14de06ddf27fba75f2acb7f6c1775c8509cb4..4347b4c1c0ff5843c12a57063c258625a83eded7 100644 (file)
--- a/process.c
+++ b/process.c
@@ -73,7 +73,7 @@ print_user_offset_addr(const kernel_ureg_t addr)
                        printaddr(addr);
                } else {
                        --x;
-                       tprintf("%s + %lu",
+                       tprintf("%s + %" PRI_kru,
                                x->str, addr - (kernel_ureg_t) x->val);
                }
        } else {
@@ -121,7 +121,7 @@ SYS_FUNC(ptrace)
                case PTRACE_GETSIGMASK:
                case PTRACE_SETSIGMASK:
                case PTRACE_SECCOMP_GET_FILTER:
-                       tprintf(", %lu", addr);
+                       tprintf(", %" PRI_kru, addr);
                        break;
                case PTRACE_PEEKSIGINFO: {
                        tprints(", ");
index 203886ab656e932bb9b3baec8f608c11d8684e5f..3bc0932092e5ec2f64a17cf47a8b342f9991a63b 100644 (file)
@@ -43,13 +43,13 @@ SYS_FUNC(process_vm_readv)
                           syserror(tcp) ? IOV_DECODE_ADDR : IOV_DECODE_STR,
                           tcp->u_rval);
                /* arg 3: local iovcnt */
-               tprintf(", %lu, ", local_iovcnt);
+               tprintf(", %" PRI_kru ", ", local_iovcnt);
                /* arg 4: remote iov */
                tprint_iov(tcp, remote_iovcnt, tcp->u_arg[3],
                           IOV_DECODE_ADDR);
                /* arg 5: remote iovcnt */
                /* arg 6: flags */
-               tprintf(", %lu, %lu", remote_iovcnt, flags);
+               tprintf(", %" PRI_kru ", %" PRI_kru, remote_iovcnt, flags);
        }
        return 0;
 }
@@ -65,12 +65,12 @@ SYS_FUNC(process_vm_writev)
        /* arg 2: local iov */
        tprint_iov(tcp, local_iovcnt, tcp->u_arg[1], IOV_DECODE_STR);
        /* arg 3: local iovcnt */
-       tprintf(", %lu, ", local_iovcnt);
+       tprintf(", %" PRI_kru ", ", local_iovcnt);
        /* arg 4: remote iov */
        tprint_iov(tcp, remote_iovcnt, tcp->u_arg[3], IOV_DECODE_ADDR);
        /* arg 5: remote iovcnt */
        /* arg 6: flags */
-       tprintf(", %lu, %lu", remote_iovcnt, flags);
+       tprintf(", %" PRI_kru ", %" PRI_kru, remote_iovcnt, flags);
 
        return RVAL_DECODED;
 }
diff --git a/ptp.c b/ptp.c
index 83e0b17b0491697bb9fcf166c60fa068145b1011..f01f9c4c00deabd78d18cb4d3f83fb0fc0dfc093 100644 (file)
--- a/ptp.c
+++ b/ptp.c
@@ -72,7 +72,7 @@ ptp_ioctl(struct tcb *const tcp, const unsigned int code,
        }
 
        case PTP_ENABLE_PPS:
-               tprintf(", %ld", arg);
+               tprintf(", %" PRI_krd, arg);
                break;
 
        case PTP_SYS_OFFSET: {
index f2b9c8021e36b3430e2e753eb4fa16de0dfa6588..1391878927a3e65842a083f140647cd016e80bcc 100644 (file)
@@ -6,7 +6,7 @@ SYS_FUNC(readahead)
 
        printfd(tcp, tcp->u_arg[0]);
        argn = printllval(tcp, ", %lld", 1);
-       tprintf(", %lu", tcp->u_arg[argn]);
+       tprintf(", %" PRI_kru, tcp->u_arg[argn]);
 
        return RVAL_DECODED;
 }
index af4f319f95809cf3461947d7d0295eda59e226b1..b048a4e9b63286752d4d980611bd7b1139f9d04c 100644 (file)
@@ -51,7 +51,7 @@ decode_readlink(struct tcb *tcp, int offset)
                         * past return buffer's end.
                         */
                        printstrn(tcp, tcp->u_arg[offset + 1], tcp->u_rval);
-               tprintf(", %lu", tcp->u_arg[offset + 2]);
+               tprintf(", %" PRI_kru, tcp->u_arg[offset + 2]);
        }
        return 0;
 }
diff --git a/rtc.c b/rtc.c
index cadb1e4e9d7a6873a327233e6eb2215022627a76..915bb09ecf27a9f4447b79d959c12e4ad52cbf75 100644 (file)
--- a/rtc.c
+++ b/rtc.c
@@ -100,7 +100,7 @@ MPERS_PRINTER_DECL(int, rtc_ioctl, struct tcb *const tcp,
                break;
        case RTC_IRQP_SET:
        case RTC_EPOCH_SET:
-               tprintf(", %lu", arg);
+               tprintf(", %" PRI_kru, arg);
                break;
        case RTC_IRQP_READ:
        case RTC_EPOCH_READ:
index 97fd7c50ac3a93d4c94debb4906f832f0fcf9b2e..293316fe95fcf8e8b2b1a6d752502cea54379a28 100644 (file)
@@ -35,7 +35,7 @@ SYS_FUNC(sendfile64)
                printfd(tcp, tcp->u_arg[1]);
                tprints(", ");
                if (!printnum_int64(tcp, tcp->u_arg[2], "%" PRIu64)) {
-                       tprintf(", %lu", tcp->u_arg[3]);
+                       tprintf(", %" PRI_kru, tcp->u_arg[3]);
                        return RVAL_DECODED;
                }
        } else {
@@ -43,7 +43,7 @@ SYS_FUNC(sendfile64)
                        tprints(" => ");
                        printnum_int64(tcp, tcp->u_arg[2], "%" PRIu64);
                }
-               tprintf(", %lu", tcp->u_arg[3]);
+               tprintf(", %" PRI_kru, tcp->u_arg[3]);
        }
 
        return 0;
@@ -58,7 +58,7 @@ SYS_FUNC(sendfile)
                tprints(", ");
                if (!printnum_ulong(tcp, tcp->u_arg[2])
                    || !tcp->u_arg[3]) {
-                       tprintf(", %lu", tcp->u_arg[3]);
+                       tprintf(", %" PRI_kru, tcp->u_arg[3]);
                        return RVAL_DECODED;
                }
        } else {
@@ -66,7 +66,7 @@ SYS_FUNC(sendfile)
                        tprints(" => ");
                        printnum_ulong(tcp, tcp->u_arg[2]);
                }
-               tprintf(", %lu", tcp->u_arg[3]);
+               tprintf(", %" PRI_kru, tcp->u_arg[3]);
        }
 
        return 0;
index 1265990f053897781e452dad2cb4c84d5c6ed341..bc60aef5a15c1f8ab5265aa79459a7e55752a727 100644 (file)
@@ -52,7 +52,7 @@ print_stack_t(struct tcb *const tcp, const kernel_ureg_t addr)
        printaddr(ptr_to_kulong(ss.ss_sp));
        tprints(", ss_flags=");
        printflags(sigaltstack_flags, ss.ss_flags, "SS_???");
-       tprintf(", ss_size=%lu}", (kernel_ureg_t) ss.ss_size);
+       tprintf(", ss_size=%" PRI_kru "}", (kernel_ureg_t) ss.ss_size);
 }
 
 SYS_FUNC(sigaltstack)
index e332982fb7bdb56b6475f623dd5b570f4bb5c3c3..c40466fe980d53a2b50deddbf93c8c9320d08cad 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -463,7 +463,7 @@ SYS_FUNC(rt_sigprocmask)
        }
        else {
                print_sigset_addr_len(tcp, tcp->u_arg[2], tcp->u_arg[3]);
-               tprintf(", %lu", tcp->u_arg[3]);
+               tprintf(", %" PRI_kru, tcp->u_arg[3]);
        }
        return 0;
 }
@@ -561,11 +561,11 @@ SYS_FUNC(rt_sigaction)
        } else {
                decode_new_sigaction(tcp, tcp->u_arg[2]);
 #if defined(SPARC) || defined(SPARC64)
-               tprintf(", %#lx, %lu", tcp->u_arg[3], tcp->u_arg[4]);
+               tprintf(", %#" PRI_krx ", %" PRI_kru, tcp->u_arg[3], tcp->u_arg[4]);
 #elif defined(ALPHA)
-               tprintf(", %lu, %#lx", tcp->u_arg[3], tcp->u_arg[4]);
+               tprintf(", %" PRI_kru ", %#" PRI_krx, tcp->u_arg[3], tcp->u_arg[4]);
 #else
-               tprintf(", %lu", tcp->u_arg[3]);
+               tprintf(", %" PRI_kru, tcp->u_arg[3]);
 #endif
        }
        return 0;
@@ -582,7 +582,7 @@ SYS_FUNC(rt_sigpending)
                 */
                print_sigset_addr_len_limit(tcp, tcp->u_arg[0],
                                            tcp->u_arg[1], 1);
-               tprintf(", %lu", tcp->u_arg[1]);
+               tprintf(", %" PRI_kru, tcp->u_arg[1]);
        }
        return 0;
 }
@@ -591,7 +591,7 @@ SYS_FUNC(rt_sigsuspend)
 {
        /* NB: kernel requires arg[1] == NSIG / 8 */
        print_sigset_addr_len(tcp, tcp->u_arg[0], tcp->u_arg[1]);
-       tprintf(", %lu", tcp->u_arg[1]);
+       tprintf(", %" PRI_kru, tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }
@@ -636,7 +636,7 @@ SYS_FUNC(rt_sigtimedwait)
                        printaddr(tcp->u_arg[1]);
                        tprints(", ");
                        print_timespec(tcp, tcp->u_arg[2]);
-                       tprintf(", %lu", tcp->u_arg[3]);
+                       tprintf(", %" PRI_kru, tcp->u_arg[3]);
                } else {
                        char *sts = xstrdup(sprint_timespec(tcp, tcp->u_arg[2]));
                        set_tcb_priv_data(tcp, sts, free);
@@ -646,7 +646,7 @@ SYS_FUNC(rt_sigtimedwait)
                        printsiginfo_at(tcp, tcp->u_arg[1]);
                        tprints(", ");
                        tprints(get_tcb_priv_data(tcp));
-                       tprintf(", %lu", tcp->u_arg[3]);
+                       tprintf(", %" PRI_kru, tcp->u_arg[3]);
                }
 
                if (!syserror(tcp) && tcp->u_rval) {
index 8ddf871ab3a497c0d127ab27c0b4f9eef9ae7149..00414a58ebe0b2f144b3a9ea777dae6df9befe67 100644 (file)
@@ -40,7 +40,7 @@ do_signalfd(struct tcb *tcp, int flags_arg)
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
        print_sigset_addr_len(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       tprintf(", %lu", tcp->u_arg[2]);
+       tprintf(", %" PRI_kru, tcp->u_arg[2]);
        if (flags_arg >= 0) {
                tprints(", ");
                printflags(sfd_flags, tcp->u_arg[flags_arg], "SFD_???");
index 45a22d327da8a5f90a066edcbf4607e553ee0bf7..dc051818356beda4ad12d22884cbc21353a69d7a 100644 (file)
@@ -4,7 +4,7 @@ SYS_FUNC(statfs64)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", %lu, ", tcp->u_arg[1]);
+               tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
        } else {
                print_struct_statfs64(tcp, tcp->u_arg[2], tcp->u_arg[1]);
        }
index 105147b91d6437283977656a3735cafc90e01bdc..d19777e834ba055db99b443e969ab2c76112769e 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -822,7 +822,7 @@ trace_syscall_exiting(struct tcb *tcp)
                        if (syscall_fault_injected(tcp))
                                tprints(" (INJECTED)");
                } else {
-                       tprintf("= %#lx", tcp->u_rval);
+                       tprintf("= %#" PRI_krx, tcp->u_rval);
                }
        }
        else if (!(sys_res & RVAL_NONE) && u_error) {
@@ -907,7 +907,7 @@ trace_syscall_exiting(struct tcb *tcp)
                                                (unsigned int) tcp->u_rval);
                                else
 #endif
-                                       tprintf("= %#lx", tcp->u_rval);
+                                       tprintf("= %#" PRI_krx, tcp->u_rval);
                                break;
                        case RVAL_OCTAL:
                                tprints("= ");
@@ -920,10 +920,10 @@ trace_syscall_exiting(struct tcb *tcp)
                                                (unsigned int) tcp->u_rval);
                                else
 #endif
-                                       tprintf("= %lu", tcp->u_rval);
+                                       tprintf("= %" PRI_kru, tcp->u_rval);
                                break;
                        case RVAL_DECIMAL:
-                               tprintf("= %ld", tcp->u_rval);
+                               tprintf("= %" PRI_krd, tcp->u_rval);
                                break;
                        case RVAL_FD:
                                if (show_fd_path) {
@@ -931,7 +931,7 @@ trace_syscall_exiting(struct tcb *tcp)
                                        printfd(tcp, tcp->u_rval);
                                }
                                else
-                                       tprintf("= %ld", tcp->u_rval);
+                                       tprintf("= %" PRI_krd, tcp->u_rval);
                                break;
 #if HAVE_STRUCT_TCB_EXT_ARG
                        /*
@@ -1058,8 +1058,9 @@ print_pc(struct tcb *tcp)
                tprints(current_wordsize == 4 ? "[????????] "
                                              : "[????????????????] ");
        else
-               tprintf(current_wordsize == 4 ? "[%08lx] " : "[%016lx] ",
-                       (unsigned long) ARCH_PC_REG);
+               tprintf(current_wordsize == 4
+                       ? "[%08" PRI_krx "] " : "[%016" PRI_krx "] ",
+                       (kernel_ureg_t) ARCH_PC_REG);
 }
 
 #include "getregs_old.h"
@@ -1189,7 +1190,7 @@ set_regs(pid_t pid)
 struct sysent_buf {
        struct tcb *tcp;
        struct_sysent ent;
-       char buf[sizeof("syscall_%lu") + sizeof(long) * 3];
+       char buf[sizeof("syscall_%lu") + sizeof(kernel_scno_t) * 3];
 };
 
 static void
@@ -1228,7 +1229,7 @@ get_scno(struct tcb *tcp)
                s->ent.sen = SEN_printargs;
                s->ent.sys_func = printargs;
                s->ent.sys_name = s->buf;
-               sprintf(s->buf, "syscall_%lu", shuffle_scno(tcp->scno));
+               sprintf(s->buf, "syscall_%" PRI_kru, shuffle_scno(tcp->scno));
 
                tcp->s_ent = &s->ent;
                tcp->qual_flg = QUAL_RAW | DEFAULT_QUAL_FLAGS;
@@ -1236,7 +1237,8 @@ get_scno(struct tcb *tcp)
                set_tcb_priv_data(tcp, s, free_sysent_buf);
 
                if (debug_flag)
-                       error_msg("pid %d invalid syscall %ld", tcp->pid, tcp->scno);
+                       error_msg("pid %d invalid syscall %" PRI_krd,
+                                 tcp->pid, tcp->scno);
        }
        return 1;
 }
index c04f7bd90ec24d492fc37e3be81b8a3bbdbd1644..90f55d31d61a12e940b9f5eb09444ef29c2c6b1e 100644 (file)
--- a/syslog.c
+++ b/syslog.c
@@ -62,7 +62,7 @@ SYS_FUNC(syslog)
                        break;
                default:
                        printaddr(tcp->u_arg[1]);
-                       tprintf(", %lu", tcp->u_arg[2]);
+                       tprintf(", %" PRI_kru, tcp->u_arg[2]);
                        return RVAL_DECODED;
        }
 
index 25fd6687ff25e0001de7d5eb9144963f8e3c90a8..fae9e6a82e439615e68723146cdf0b50ed8cfdb3 100644 (file)
--- a/sysmips.c
+++ b/sysmips.c
@@ -65,14 +65,15 @@ SYS_FUNC(sysmips)
        }
        case MIPS_ATOMIC_SET:
                printaddr(tcp->u_arg[1]);
-               tprintf(", %#lx", tcp->u_arg[2]);
+               tprintf(", %#" PRI_krx, tcp->u_arg[2]);
                return RVAL_DECODED;
        case MIPS_FIXADE:
-               tprintf("%#lx", tcp->u_arg[1]);
+               tprintf("%#" PRI_krx, tcp->u_arg[1]);
                return RVAL_DECODED;
        }
 
-       tprintf("%ld, %ld, %ld", tcp->u_arg[1], tcp->u_arg[2], tcp->u_arg[3]);
+       tprintf("%" PRI_krd ", %" PRI_krd ", %" PRI_krd,
+               tcp->u_arg[1], tcp->u_arg[2], tcp->u_arg[3]);
        return RVAL_DECODED;
 }
 
index 1428094a908a47394cbff7f77d4fce3bfbb37197..3d574a3ce51a9e3248858045db0aa1586ae782ec 100644 (file)
@@ -3,7 +3,7 @@
 SYS_FUNC(truncate)
 {
        printpath(tcp, tcp->u_arg[0]);
-       tprintf(", %lu", tcp->u_arg[1]);
+       tprintf(", %" PRI_kru, tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }
@@ -19,7 +19,7 @@ SYS_FUNC(truncate64)
 SYS_FUNC(ftruncate)
 {
        printfd(tcp, tcp->u_arg[0]);
-       tprintf(", %lu", tcp->u_arg[1]);
+       tprintf(", %" PRI_kru, tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }
diff --git a/util.c b/util.c
index b977924c063ef790a38398c6200799c7c046b295..f1e552ed95804dbb4fa84aedf1a31c37419b3527 100644 (file)
--- a/util.c
+++ b/util.c
@@ -956,7 +956,7 @@ dumpiov_upto(struct tcb *const tcp, const int len, const kernel_ureg_t addr,
                        data_size -= iov_len;
                        /* include the buffer number to make it easy to
                         * match up the trace with the source */
-                       tprintf(" * %lu bytes in buffer %d\n", iov_len, i);
+                       tprintf(" * %" PRI_kru " bytes in buffer %d\n", iov_len, i);
                        dumpstr(tcp, iov_iov_base(i), iov_len);
                }
        }
@@ -1127,7 +1127,7 @@ umoven(struct tcb *const tcp, kernel_ureg_t addr, unsigned int len,
                if ((unsigned int) r == len)
                        return 0;
                if (r >= 0) {
-                       error_msg("umoven: short read (%u < %u) @0x%lx",
+                       error_msg("umoven: short read (%u < %u) @0x%" PRI_krx,
                                  (unsigned int) r, len, addr);
                        return -1;
                }
@@ -1169,7 +1169,7 @@ umoven(struct tcb *const tcp, kernel_ureg_t addr, unsigned int len,
                                return -1;
                        default:
                                /* all the rest is strange and should be reported */
-                               perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%lx",
+                               perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%" PRI_krx,
                                            pid, addr);
                                return -1;
                }
@@ -1192,13 +1192,13 @@ umoven(struct tcb *const tcp, kernel_ureg_t addr, unsigned int len,
                        case EFAULT: case EIO: case EPERM:
                                /* address space is inaccessible */
                                if (nread) {
-                                       perror_msg("umoven: short read (%u < %u) @0x%lx",
+                                       perror_msg("umoven: short read (%u < %u) @0x%" PRI_krx,
                                                   nread, nread + len, addr - nread);
                                }
                                return -1;
                        default:
                                /* all the rest is strange and should be reported */
-                               perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%lx",
+                               perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%" PRI_krx,
                                            pid, addr);
                                return -1;
                }
@@ -1312,7 +1312,7 @@ umovestr(struct tcb *const tcp, kernel_ureg_t addr, unsigned int len, char *ladd
                                case EFAULT: case EIO:
                                        /* address space is inaccessible */
                                        if (nread) {
-                                               perror_msg("umovestr: short read (%d < %d) @0x%lx",
+                                               perror_msg("umovestr: short read (%d < %d) @0x%" PRI_krx,
                                                           nread, nread + len, addr - nread);
                                        }
                                        return -1;
@@ -1343,7 +1343,7 @@ umovestr(struct tcb *const tcp, kernel_ureg_t addr, unsigned int len, char *ladd
                                return -1;
                        default:
                                /* all the rest is strange and should be reported */
-                               perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%lx",
+                               perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%" PRI_krx,
                                            pid, addr);
                                return -1;
                }
@@ -1370,13 +1370,13 @@ umovestr(struct tcb *const tcp, kernel_ureg_t addr, unsigned int len, char *ladd
                        case EFAULT: case EIO: case EPERM:
                                /* address space is inaccessible */
                                if (nread) {
-                                       perror_msg("umovestr: short read (%d < %d) @0x%lx",
+                                       perror_msg("umovestr: short read (%d < %d) @0x%" PRI_krx,
                                                   nread, nread + len, addr - nread);
                                }
                                return -1;
                        default:
                                /* all the rest is strange and should be reported */
-                               perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%lx",
+                               perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%" PRI_krx,
                                           pid, addr);
                                return -1;
                }
diff --git a/xattr.c b/xattr.c
index b2a973bec6d9ada72ed1e4a3eac0cec30f3bd94a..f6f9d6de1c5a9c595e547ef2a645b1d3d58d121d 100644 (file)
--- a/xattr.c
+++ b/xattr.c
@@ -51,7 +51,7 @@ print_xattr_val(struct tcb *const tcp,
                printaddr(addr);
        else
                printstr_ex(tcp, addr, size, QUOTE_OMIT_TRAILING_0);
-       tprintf(", %lu", insize);
+       tprintf(", %" PRI_kru, insize);
 }
 
 SYS_FUNC(setxattr)
@@ -109,7 +109,7 @@ print_xattr_list(struct tcb *const tcp, const kernel_ureg_t addr,
        } else {
                printstrn(tcp, addr, tcp->u_rval);
        }
-       tprintf(", %lu", size);
+       tprintf(", %" PRI_kru, size);
 }
 
 SYS_FUNC(listxattr)