Automatically replace PRI_kr[dux] with PRI_kl[dux]

Remove temporary macros created for transition from long
to kernel_ulong_t.

Automatically replace PRI_kr[dux] with PRI_kl[dux] using
$ git grep -l 'PRI_kr[dux]' | xargs sed -ri 's/PRI_kr([dux])/PRI_kl\1/g'

* defs.h (PRI_krd, PRI_kru, PRI_krx): Remove.  All users updated.

diff --git a/block.c b/block.c
index db23e0d262ae0bffeccd85c66d5840192d7e8845..4d1a965b40b59d83210047f2e308e9f2b7e944ac 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(", %" PRI_kru, arg);
+               tprintf(", %" PRI_klu, arg);
                break;
 
        /* return an unsigned short */

diff --git a/clone.c b/clone.c
index 10cf91d8911c1f20a8dc7ffd9c3595084b856b74..fdebf59471bfde0474194b4d181f64d35a67fbeb 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=%#" PRI_krx ", ",
+                       tprintf("stack_size=%#" PRI_klx ", ",
                                tcp->u_arg[ARG_STACKSIZE]);
 #endif
                tprints("flags=");

diff --git a/copy_file_range.c b/copy_file_range.c
index aa84486080cdc2ece11fddeca22634541149d9c8..ad858a99f35d7829517af96065abd59bc6696264 100644 (file)
--- a/copy_file_range.c
+++ b/copy_file_range.c
@@ -42,7 +42,7 @@ SYS_FUNC(copy_file_range)
        printnum_int64(tcp, tcp->u_arg[3], "%" PRId64);
        tprints(", ");
        /* size_t len */
-       tprintf("%" PRI_kru ", ", tcp->u_arg[4]);
+       tprintf("%" PRI_klu ", ", tcp->u_arg[4]);
        /* unsigned int flags */
        tprintf("%u", (unsigned int) tcp->u_arg[5]);
 

diff --git a/defs.h b/defs.h
index 7c062eb6fe7ed50a88617f68e03f04d5203c30d3..054ca01a299b37e1321177b57f48b15e5e8cc051 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -985,10 +985,6 @@ scno_is_valid(kernel_ulong_t scno)
 #define PRI_klu PRI_kl"u"
 #define PRI_klx PRI_kl"x"
 
-#define PRI_krd PRI_kld
-#define PRI_kru PRI_klu
-#define PRI_krx PRI_klx
-
 /*
  * 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

diff --git a/dirent.c b/dirent.c
index e09128cb417eea0a760a2798f5555c28f8b1e64f..2ba6fe7abef6249f4a16e8a656dab16ad4aa5ba4 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(", %" PRI_kru, tcp->u_arg[2]);
+                       tprintf(", %" PRI_klu, tcp->u_arg[2]);
        }
        return 0;
 }

diff --git a/epoll.c b/epoll.c
index e0a58f6889f618eaa14d149c025edb87f2b7a727..ee5499145258d016f8eb4f50cd233e9639fb000c 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(", %" PRI_kru, tcp->u_arg[5]);
+               tprintf(", %" PRI_klu, tcp->u_arg[5]);
        }
        return 0;
 }

diff --git a/evdev.c b/evdev.c
index 8945cfcb825c270046a4604270330b735d0b038f..6874551572151aa522e3ed6f71ef225350720a20 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(", %" PRI_kru, arg);
+                       tprintf(", %" PRI_klu, arg);
                        return 1;
 # ifdef EVIOCSCLOCKID
                case EVIOCSCLOCKID:

diff --git a/fcntl.c b/fcntl.c
index 2f84e11521cf2fe1b2ec43193b2133ea34dfaac1..74168c6a26cedc78c0ac89dd3501951a576d7c3a 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(", %" PRI_krd, tcp->u_arg[2]);
+               tprintf(", %" PRI_kld, tcp->u_arg[2]);
                break;
        case F_DUPFD:
        case F_DUPFD_CLOEXEC:
-               tprintf(", %" PRI_krd, tcp->u_arg[2]);
+               tprintf(", %" PRI_kld, 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(", %#" PRI_krx, tcp->u_arg[2]);
+               tprintf(", %#" PRI_klx, tcp->u_arg[2]);
                break;
        }
        return RVAL_DECODED;

diff --git a/fstatfs64.c b/fstatfs64.c
index da50240ad671ebc0f32501b637a0953fb392a800..166fc63da43ef7b8d8e0f88d7a37eff65ee60a56 100644 (file)
--- a/fstatfs64.c
+++ b/fstatfs64.c
@@ -4,7 +4,7 @@ SYS_FUNC(fstatfs64)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
-               tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
+               tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
        } else {
                print_struct_statfs64(tcp, tcp->u_arg[2], tcp->u_arg[1]);
        }

diff --git a/getcwd.c b/getcwd.c
index a3b2bf1f0f255d546f3c6110c589743a3352ab01..a8ef591b327037d827661949dab53212fe603f8f 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(", %" PRI_kru, tcp->u_arg[1]);
+               tprintf(", %" PRI_klu, tcp->u_arg[1]);
        }
        return 0;
 }

diff --git a/getrandom.c b/getrandom.c
index 10d0941317cc669e2475d7848136e1390849c3ac..0a353adb95c42f9fa75d62820b1f72e3d5bf5afb 100644 (file)
--- a/getrandom.c
+++ b/getrandom.c
@@ -8,7 +8,7 @@ SYS_FUNC(getrandom)
                        printaddr(tcp->u_arg[0]);
                else
                        printstrn(tcp, tcp->u_arg[0], tcp->u_rval);
-               tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
+               tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
                printflags(getrandom_flags, tcp->u_arg[2], "GRND_???");
        }
        return 0;

diff --git a/hostname.c b/hostname.c
index f852faa485ecbf89184ae2ccdd6913261e19bc9d..75f96ba69c3e0314ea11e1044e757fe5352ac513 100644 (file)
--- a/hostname.c
+++ b/hostname.c
@@ -31,7 +31,7 @@ SYS_FUNC(gethostname)
                        printaddr(tcp->u_arg[0]);
                else
                        printstr(tcp, tcp->u_arg[0]);
-               tprintf(", %" PRI_kru, tcp->u_arg[1]);
+               tprintf(", %" PRI_klu, tcp->u_arg[1]);
        }
        return 0;
 }

diff --git a/io.c b/io.c
index a785711d90ff9fb4c3a5673ca7cd26229e42d265..7088e856737f6ec13f8451d85f57e3eda152bb62 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(", %" PRI_kru, tcp->u_arg[2]);
+               tprintf(", %" PRI_klu, 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(", %" PRI_kru, tcp->u_arg[2]);
+       tprintf(", %" PRI_klu, 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=%" PRI_kru "}", iov[1]);
+       tprintf(", iov_len=%" PRI_klu "}", 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(", %" PRI_kru, tcp->u_arg[2]);
+               tprintf(", %" PRI_klu, 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(", %" PRI_kru, tcp->u_arg[2]);
+       tprintf(", %" PRI_klu, 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(", %" PRI_kru ", ", tcp->u_arg[2]);
+               tprintf(", %" PRI_klu ", ", 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(", %" PRI_kru ", ", tcp->u_arg[2]);
+       tprintf(", %" PRI_klu ", ", 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("%" PRI_krd, (tcp->u_arg[arg + 1] << current_wordsize * 8)
+               tprintf("%" PRI_kld, (tcp->u_arg[arg + 1] << current_wordsize * 8)
                               | tcp->u_arg[arg]);
        } else
 # endif /* !current_klongsize */
        {
-               tprintf("%" PRI_krd, tcp->u_arg[arg]);
+               tprintf("%" PRI_kld, 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("%" PRI_kru ", ", tcp->u_arg[2]);
+       tprintf("%" PRI_klu ", ", 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("%" PRI_kru ", ", tcp->u_arg[4]);
+       tprintf("%" PRI_klu ", ", 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(", %" PRI_kru ", ", tcp->u_arg[2]);
+       tprintf(", %" PRI_klu ", ", 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 2ed22cf97964ce440ce76589285c5c13f686bf63..82a1783be1e8b508bb781622ab95ee75d6e95bc4 100644 (file)
--- a/ioctl.c
+++ b/ioctl.c
@@ -323,7 +323,7 @@ SYS_FUNC(ioctl)
                if (ret)
                        --ret;
                else
-                       tprintf(", %#" PRI_krx, tcp->u_arg[2]);
+                       tprintf(", %#" PRI_klx, tcp->u_arg[2]);
                ret |= RVAL_DECODED;
        } else {
                if (ret)

diff --git a/ioperm.c b/ioperm.c
index 1dad0e3360ea231fb1f6d96928c197bcc84bae8e..e9eea7f6f31ac25d48eec2d706415da793021d21 100644 (file)
--- a/ioperm.c
+++ b/ioperm.c
@@ -2,7 +2,7 @@
 
 SYS_FUNC(ioperm)
 {
-       tprintf("%#" PRI_krx ", %#" PRI_krx ", %d",
+       tprintf("%#" PRI_klx ", %#" PRI_klx ", %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 0e1870dcb558d455b32e2368fc2053718e644abd..bd23a4ed90eab41dac45a758af06b32a1a3418ee 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(", %#" PRI_krx, tcp->u_arg[i]);
+               tprintf(", %#" PRI_klx, tcp->u_arg[i]);
 
        return RVAL_DECODED;
 }

diff --git a/ipc_msg.c b/ipc_msg.c
index 42c6cd7959681e0cb8224d132156db2607566de4..a5f9e83e371789e6043728242bb62e15cb74f82c 100644 (file)
--- a/ipc_msg.c
+++ b/ipc_msg.c
@@ -82,7 +82,7 @@ tprint_msgrcv(struct tcb *const tcp, const kernel_ulong_t addr,
              const kernel_ulong_t count, const kernel_ulong_t msgtyp)
 {
        tprint_msgbuf(tcp, addr, count);
-       tprintf("%" PRI_krd ", ", msgtyp);
+       tprintf("%" PRI_kld ", ", msgtyp);
 }
 
 static int
@@ -121,7 +121,7 @@ SYS_FUNC(msgrcv)
                                kernel_ulong_t pair[2];
 
                                if (fetch_msgrcv_args(tcp, tcp->u_arg[3], pair))
-                                       tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
+                                       tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
                                else
                                        tprint_msgrcv(tcp, pair[0],
                                                      tcp->u_arg[1], pair[1]);

diff --git a/ipc_sem.c b/ipc_sem.c
index 03dbfe2eb95ea0f22b6488820b918f6ba1ac9d7f..b2a7e1252f3e00c11de3a615670d773cccd2a3d4 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("%#" PRI_krx, tcp->u_arg[3]);
+               tprintf("%#" PRI_klx, tcp->u_arg[3]);
        }
        return RVAL_DECODED;
 }

diff --git a/ipc_shm.c b/ipc_shm.c
index a4f022500ebfa0edd4295f2a3ce71397f1750015..c4bdb87a154f9c49fa66a46e37bfe6f27bb587f1 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(", %" PRI_kru ", ", tcp->u_arg[1]);
+       tprintf(", %" PRI_klu ", ", 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 a851d6a8d93dd1c2d02b5b888c155ea864e13779..0917e24f73ee16151ef67ab49b082f440b7f1cd7 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=%" PRI_kru ", mem=", seg[1]);
+       tprintf(", bufsz=%" PRI_klu ", mem=", seg[1]);
        printaddr(seg[2]);
-       tprintf(", memsz=%" PRI_kru "}", seg[3]);
+       tprintf(", memsz=%" PRI_klu "}", seg[3]);
 
        return true;
 }
@@ -82,7 +82,7 @@ SYS_FUNC(kexec_load)
 {
        /* entry, nr_segments */
        printaddr(tcp->u_arg[0]);
-       tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
 
        /* segments */
        print_kexec_segments(tcp, tcp->u_arg[2], tcp->u_arg[1]);

diff --git a/keyctl.c b/keyctl.c
index 44ec827b79b1875e0dbceff02db622ae9e94dae5..f959ac524dc6e52a21f4ab22c602be1c6dfa5832 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(", %" PRI_kru ", ", tcp->u_arg[3]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[3]);
        /* keyring serial number */
        print_keyring_serial_number(tcp->u_arg[4]);
 

diff --git a/ldt.c b/ldt.c
index b0c9dbd23675c9ca902ff756515cd06c1da9909c..91bdf15deb63eb4a942d4668a21882cac2496b1b 100644 (file)
--- a/ldt.c
+++ b/ldt.c
@@ -67,12 +67,12 @@ print_user_desc(struct tcb *const tcp, const kernel_ulong_t addr)
 
 SYS_FUNC(modify_ldt)
 {
-       tprintf("%" PRI_krd ", ", tcp->u_arg[0]);
+       tprintf("%" PRI_kld ", ", 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(", %" PRI_kru, tcp->u_arg[2]);
+       tprintf(", %" PRI_klu, tcp->u_arg[2]);
 
        return RVAL_DECODED;
 }

diff --git a/linux/x86_64/get_scno.c b/linux/x86_64/get_scno.c
index 05a8b5306815744d0075a3dd6af7fd8c0506953b..b8c3194809ae4061faf84499b0e63c0d13cd50d1 100644 (file)
--- a/linux/x86_64/get_scno.c
+++ b/linux/x86_64/get_scno.c
@@ -141,7 +141,7 @@ arch_get_scno(struct tcb *tcp)
         * Stracing of i386 apps is still supported.
         */
        if (currpers == 0) {
-               error_msg("syscall_%" PRI_kru "(...) in unsupported "
+               error_msg("syscall_%" PRI_klu "(...) in unsupported "
                          "64-bit mode of process PID=%d", scno, tcp->pid);
                return 0;
        }

diff --git a/loop.c b/loop.c
index 1699394a786d98377e30ec1940eaec8e33266a19..02b8dcfb8da211f007e30d25df14ffac1e5f3e00 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(", %" PRI_kru, arg);
+               tprintf(", %" PRI_klu, arg);
                break;
 #endif
 

diff --git a/mem.c b/mem.c
index 4e556ded4cbe5577d1cb57d6bc6a02ec32e97f5f..7979b14fade72064cccf436e3253364e627e45ce 100644 (file)
--- a/mem.c
+++ b/mem.c
@@ -64,7 +64,7 @@ print_mmap(struct tcb *tcp, kernel_ulong_t *u_arg, unsigned long long offset)
        const int fd = u_arg[4];
 
        printaddr(addr);
-       tprintf(", %" PRI_kru ", ", len);
+       tprintf(", %" PRI_klu ", ", 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(", %" PRI_kru, tcp->u_arg[1]);
+       tprintf(", %" PRI_klu, tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }
@@ -210,7 +210,7 @@ SYS_FUNC(pkey_mprotect)
 SYS_FUNC(mremap)
 {
        printaddr(tcp->u_arg[0]);
-       tprintf(", %" PRI_kru ", %" PRI_kru ", ", tcp->u_arg[1], tcp->u_arg[2]);
+       tprintf(", %" PRI_klu ", %" PRI_klu ", ", 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(", %" PRI_kru ", ", tcp->u_arg[1]);
+       tprintf(", %" PRI_klu ", ", 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(", %" PRI_kru ", ", tcp->u_arg[1]);
+       tprintf(", %" PRI_klu ", ", 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(", %" PRI_kru ", ", tcp->u_arg[1]);
+       tprintf(", %" PRI_klu ", ", 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(", %" PRI_kru ", ", tcp->u_arg[1]);
+               tprintf(", %" PRI_klu ", ", 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_ulong_t flags = tcp->u_arg[4];
 
        printaddr(addr);
-       tprintf(", %" PRI_kru ", ", size);
+       tprintf(", %" PRI_klu ", ", size);
        printflags64(mmap_prot, prot, "PROT_???");
-       tprintf(", %" PRI_kru ", ", pgoff);
+       tprintf(", %" PRI_klu ", ", 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_ulong_t map = tcp->u_arg[2];
 
        printaddr(addr);
-       tprintf(", %" PRI_kru ", ", len);
+       tprintf(", %" PRI_klu ", ", len);
 
        unsigned int entry;
        print_array(tcp, map, nmemb, &entry, sizeof(entry),

diff --git a/mmsghdr.c b/mmsghdr.c
index 6dfe9b83efa262a0cf0a0a141bdd22e8e8c89e95..c9e6cf0b15f24d6019fd923bd0630c3334f739aa 100644 (file)
--- a/mmsghdr.c
+++ b/mmsghdr.c
@@ -159,7 +159,7 @@ dumpiov_in_mmsghdr(struct tcb *const tcp, kernel_ulong_t addr)
                fetched = fetch_struct_mmsghdr(tcp, addr, &mmsg);
                if (!fetched)
                        break;
-               tprintf(" = %" PRI_kru " buffers in vector %u\n",
+               tprintf(" = %" PRI_klu " buffers in vector %u\n",
                        (kernel_ulong_t) mmsg.msg_hdr.msg_iovlen, i);
                dumpiov_upto(tcp, mmsg.msg_hdr.msg_iovlen,
                             ptr_to_kulong(mmsg.msg_hdr.msg_iov),

diff --git a/msghdr.c b/msghdr.c
index ee069e3d7530b58d848eef1c0a27e3de0016b3e2..f9264a60013e2dee6f117d6b673d0f3070809cb4 100644 (file)
--- a/msghdr.c
+++ b/msghdr.c
@@ -297,7 +297,7 @@ decode_msg_control(struct tcb *const tcp, const kernel_ulong_t addr,
 
                if (u.ptr != buf)
                        tprints(", ");
-               tprintf("{cmsg_len=%" PRI_kru ", cmsg_level=", cmsg_len);
+               tprintf("{cmsg_len=%" PRI_klu ", 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=%" PRI_kru, (kernel_ulong_t) msg->msg_iovlen);
+       tprintf(", msg_iovlen=%" PRI_klu, (kernel_ulong_t) msg->msg_iovlen);
 
        decode_msg_control(tcp, ptr_to_kulong(msg->msg_control),
                           msg->msg_controllen);
-       tprintf(", msg_controllen=%" PRI_kru, (kernel_ulong_t) msg->msg_controllen);
+       tprintf(", msg_controllen=%" PRI_klu, (kernel_ulong_t) msg->msg_controllen);
 
        tprints(", msg_flags=");
        printflags(msg_flags, msg->msg_flags, "MSG_???");

diff --git a/net.c b/net.c
index 9affade3975e9d91d20a81cad7978f507f93ef31..314e02abc96c7abc5dd37098441c59e88407d73f 100644 (file)
--- a/net.c
+++ b/net.c
@@ -159,7 +159,7 @@ SYS_FUNC(socket)
 #endif
 
        default:
-               tprintf("%" PRI_kru, tcp->u_arg[2]);
+               tprintf("%" PRI_klu, tcp->u_arg[2]);
                break;
        }
 
@@ -181,7 +181,7 @@ SYS_FUNC(listen)
 {
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
-       tprintf("%" PRI_kru, tcp->u_arg[1]);
+       tprintf("%" PRI_klu, 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(", %" PRI_kru ", ", tcp->u_arg[2]);
+       tprintf(", %" PRI_klu ", ", 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(", %" PRI_kru ", ", tcp->u_arg[2]);
+       tprintf(", %" PRI_klu ", ", 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(", %" PRI_kru ", ", tcp->u_arg[2]);
+               tprintf(", %" PRI_klu ", ", 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(", %" PRI_kru ", ", tcp->u_arg[2]);
+               tprintf(", %" PRI_klu ", ", 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(", %" PRI_kru, tcp->u_arg[2]);
+               tprintf(", %" PRI_klu, tcp->u_arg[2]);
        } else {
                tprints(", ");
                decode_pair_fd(tcp, tcp->u_arg[3]);

diff --git a/numa.c b/numa.c
index ececff92f64fba93350ccefe7f9607581a7fab6b..c2cd143ae200a9408300f2da3e6e0e6b0d707116 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*" PRI_krx, (int) elem_size * 2 + 2,
+               tprintf("%#0*" PRI_klx, (int) elem_size * 2 + 2,
                        * (kernel_ulong_t *) elem_buf);
        }
 
@@ -63,7 +63,7 @@ print_nodemask(struct tcb *const tcp, const kernel_ulong_t addr,
 
 SYS_FUNC(migrate_pages)
 {
-       tprintf("%d, %" PRI_kru ", ", (int) tcp->u_arg[0], tcp->u_arg[1]);
+       tprintf("%d, %" PRI_klu ", ", (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(", %" PRI_kru ", ", tcp->u_arg[1]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
        printxval64(policies, tcp->u_arg[2], "MPOL_???");
        tprints(", ");
        print_nodemask(tcp, tcp->u_arg[3], tcp->u_arg[4]);
-       tprintf(", %" PRI_kru ", ", tcp->u_arg[4]);
+       tprintf(", %" PRI_klu ", ", 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(", %" PRI_kru, tcp->u_arg[2]);
+       tprintf(", %" PRI_klu, 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(", %" PRI_kru ", ", tcp->u_arg[2]);
+               tprintf(", %" PRI_klu ", ", 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_ulong_t buf;
 
        if (entering(tcp)) {
-               tprintf("%d, %" PRI_kru ", ", (int) tcp->u_arg[0], npages);
+               tprintf("%d, %" PRI_klu ", ", (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 c612c5ee42e7ac43b38fc907cf283fb4bf7f2578..b2d2771c065aa8ca13cdbacf9c8f81143ec451e9 100644 (file)
--- a/poll.c
+++ b/poll.c
@@ -95,7 +95,7 @@ decode_poll_exiting(struct tcb *const tcp, const kernel_ulong_t pts)
                                *outptr++ = '[';
                        else
                                outptr = stpcpy(outptr, ", ");
-                       outptr += sprintf(outptr, "%#" PRI_krx, cur);
+                       outptr += sprintf(outptr, "%#" PRI_klx, 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(", %" PRI_kru, tcp->u_arg[4]);
+               tprintf(", %" PRI_klu, tcp->u_arg[4]);
 
                return 0;
        } else {

diff --git a/print_msgbuf.c b/print_msgbuf.c
index c8dab704077e3cc18dc3905f1d94306c968f11ae..348a891432df5a3d9fa68b8e4ed21411bf3bf112 100644 (file)
--- a/print_msgbuf.c
+++ b/print_msgbuf.c
@@ -48,5 +48,5 @@ MPERS_PRINTER_DECL(void, tprint_msgbuf, struct tcb *const tcp,
                printstrn(tcp, addr + sizeof(msg.mtype), count);
                tprints("}");
        }
-       tprintf(", %" PRI_kru ", ", count);
+       tprintf(", %" PRI_klu ", ", count);
 }

diff --git a/print_timespec.c b/print_timespec.c
index 158396d17c336a2facf8ec8934d348dbb4b65b54..76c70edbe0ab271d2af4454b96c66e31285203a9 100644 (file)
--- a/print_timespec.c
+++ b/print_timespec.c
@@ -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), "%#" PRI_krx, addr);
+               snprintf(buf, sizeof(buf), "%#" PRI_klx, addr);
        } else {
                snprintf(buf, sizeof(buf), timespec_fmt,
                         (intmax_t) t.tv_sec, (intmax_t) t.tv_nsec);

diff --git a/print_timeval.c b/print_timeval.c
index daed7d367d8a097acf0f9bfc894d778ae23f5ec6..5c2867541f44ebb1901bd54592cc42c74b757313 100644 (file)
--- a/print_timeval.c
+++ b/print_timeval.c
@@ -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), "%#" PRI_krx, addr);
+               snprintf(buf, sizeof(buf), "%#" PRI_klx, 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_ulong_t addr)
                strcpy(buf, "NULL");
        } else if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
                   umove(tcp, addr, &t)) {
-               snprintf(buf, sizeof(buf), "%#" PRI_krx, addr);
+               snprintf(buf, sizeof(buf), "%#" PRI_klx, addr);
        } else {
                snprintf(buf, sizeof(buf), timeval_fmt,
                         (intmax_t) t.tv_sec, (intmax_t) t.tv_usec);

diff --git a/process.c b/process.c
index 2589839aa5b43f5e7010e57c06df60a5cd3189f7..6928fb927b5fbf41691a04bfed4c5579d353a05e 100644 (file)
--- a/process.c
+++ b/process.c
@@ -73,7 +73,7 @@ print_user_offset_addr(const kernel_ulong_t addr)
                        printaddr(addr);
                } else {
                        --x;
-                       tprintf("%s + %" PRI_kru,
+                       tprintf("%s + %" PRI_klu,
                                x->str, addr - (kernel_ulong_t) x->val);
                }
        } else {
@@ -121,7 +121,7 @@ SYS_FUNC(ptrace)
                case PTRACE_GETSIGMASK:
                case PTRACE_SETSIGMASK:
                case PTRACE_SECCOMP_GET_FILTER:
-                       tprintf(", %" PRI_kru, addr);
+                       tprintf(", %" PRI_klu, addr);
                        break;
                case PTRACE_PEEKSIGINFO: {
                        tprints(", ");

diff --git a/process_vm.c b/process_vm.c
index 5c2ba4d9f0c6d2140565f247f5883fcf3530c4da..f63b91730ac9ddedf8e04e0e37cb703f62e6ee1a 100644 (file)
--- a/process_vm.c
+++ b/process_vm.c
@@ -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(", %" PRI_kru ", ", local_iovcnt);
+               tprintf(", %" PRI_klu ", ", 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(", %" PRI_kru ", %" PRI_kru, remote_iovcnt, flags);
+               tprintf(", %" PRI_klu ", %" PRI_klu, 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(", %" PRI_kru ", ", local_iovcnt);
+       tprintf(", %" PRI_klu ", ", 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(", %" PRI_kru ", %" PRI_kru, remote_iovcnt, flags);
+       tprintf(", %" PRI_klu ", %" PRI_klu, remote_iovcnt, flags);
 
        return RVAL_DECODED;
 }

diff --git a/ptp.c b/ptp.c
index 951a2b40264e490c761319298626d37575c91388..e2a720bac1b03d1f6d2a83b6790d4185c4622893 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(", %" PRI_krd, arg);
+               tprintf(", %" PRI_kld, arg);
                break;
 
        case PTP_SYS_OFFSET: {

diff --git a/readahead.c b/readahead.c
index 1391878927a3e65842a083f140647cd016e80bcc..d6caac33014ee52cd5dd4de25ba75e258e058412 100644 (file)
--- a/readahead.c
+++ b/readahead.c
@@ -6,7 +6,7 @@ SYS_FUNC(readahead)
 
        printfd(tcp, tcp->u_arg[0]);
        argn = printllval(tcp, ", %lld", 1);
-       tprintf(", %" PRI_kru, tcp->u_arg[argn]);
+       tprintf(", %" PRI_klu, tcp->u_arg[argn]);
 
        return RVAL_DECODED;
 }

diff --git a/readlink.c b/readlink.c
index b048a4e9b63286752d4d980611bd7b1139f9d04c..fd65b253902389c51dd7bf1436a41877203e15c7 100644 (file)
--- a/readlink.c
+++ b/readlink.c
@@ -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(", %" PRI_kru, tcp->u_arg[offset + 2]);
+               tprintf(", %" PRI_klu, tcp->u_arg[offset + 2]);
        }
        return 0;
 }

diff --git a/rtc.c b/rtc.c
index 2906255ec1250388333074ada01f05e69e2c0b63..43ea946651eb3e8bd2018c3a11dfa1361507fce1 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(", %" PRI_kru, arg);
+               tprintf(", %" PRI_klu, arg);
                break;
        case RTC_IRQP_READ:
        case RTC_EPOCH_READ:

diff --git a/sendfile.c b/sendfile.c
index 293316fe95fcf8e8b2b1a6d752502cea54379a28..7faf1ca275383f14f47b8bb13cd69e8c7ee091e7 100644 (file)
--- a/sendfile.c
+++ b/sendfile.c
@@ -35,7 +35,7 @@ SYS_FUNC(sendfile64)
                printfd(tcp, tcp->u_arg[1]);
                tprints(", ");
                if (!printnum_int64(tcp, tcp->u_arg[2], "%" PRIu64)) {
-                       tprintf(", %" PRI_kru, tcp->u_arg[3]);
+                       tprintf(", %" PRI_klu, 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(", %" PRI_kru, tcp->u_arg[3]);
+               tprintf(", %" PRI_klu, 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(", %" PRI_kru, tcp->u_arg[3]);
+                       tprintf(", %" PRI_klu, tcp->u_arg[3]);
                        return RVAL_DECODED;
                }
        } else {
@@ -66,7 +66,7 @@ SYS_FUNC(sendfile)
                        tprints(" => ");
                        printnum_ulong(tcp, tcp->u_arg[2]);
                }
-               tprintf(", %" PRI_kru, tcp->u_arg[3]);
+               tprintf(", %" PRI_klu, tcp->u_arg[3]);
        }
 
        return 0;

diff --git a/sigaltstack.c b/sigaltstack.c
index 03a40099b49331ab1c48e284cdd25ed9c2895312..7b624c9796f296aa70e8bc0d2012074bb70aba47 100644 (file)
--- a/sigaltstack.c
+++ b/sigaltstack.c
@@ -52,7 +52,7 @@ print_stack_t(struct tcb *const tcp, const kernel_ulong_t addr)
        printaddr(ptr_to_kulong(ss.ss_sp));
        tprints(", ss_flags=");
        printflags(sigaltstack_flags, ss.ss_flags, "SS_???");
-       tprintf(", ss_size=%" PRI_kru "}", (kernel_ulong_t) ss.ss_size);
+       tprintf(", ss_size=%" PRI_klu "}", (kernel_ulong_t) ss.ss_size);
 }
 
 SYS_FUNC(sigaltstack)

diff --git a/signal.c b/signal.c
index ee96b6298bf63e4e3c6eb114c164ab951d85d32d..30838b2347d369f95d3487d03804c19801a7534a 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(", %" PRI_kru, tcp->u_arg[3]);
+               tprintf(", %" PRI_klu, 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(", %#" PRI_krx ", %" PRI_kru, tcp->u_arg[3], tcp->u_arg[4]);
+               tprintf(", %#" PRI_klx ", %" PRI_klu, tcp->u_arg[3], tcp->u_arg[4]);
 #elif defined(ALPHA)
-               tprintf(", %" PRI_kru ", %#" PRI_krx, tcp->u_arg[3], tcp->u_arg[4]);
+               tprintf(", %" PRI_klu ", %#" PRI_klx, tcp->u_arg[3], tcp->u_arg[4]);
 #else
-               tprintf(", %" PRI_kru, tcp->u_arg[3]);
+               tprintf(", %" PRI_klu, 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(", %" PRI_kru, tcp->u_arg[1]);
+               tprintf(", %" PRI_klu, 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(", %" PRI_kru, tcp->u_arg[1]);
+       tprintf(", %" PRI_klu, 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(", %" PRI_kru, tcp->u_arg[3]);
+                       tprintf(", %" PRI_klu, 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(", %" PRI_kru, tcp->u_arg[3]);
+                       tprintf(", %" PRI_klu, tcp->u_arg[3]);
                }
 
                if (!syserror(tcp) && tcp->u_rval) {

diff --git a/signalfd.c b/signalfd.c
index 00414a58ebe0b2f144b3a9ea777dae6df9befe67..f4631ad961aacae029b5d4f9c73db2f4dc924373 100644 (file)
--- a/signalfd.c
+++ b/signalfd.c
@@ -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(", %" PRI_kru, tcp->u_arg[2]);
+       tprintf(", %" PRI_klu, tcp->u_arg[2]);
        if (flags_arg >= 0) {
                tprints(", ");
                printflags(sfd_flags, tcp->u_arg[flags_arg], "SFD_???");

diff --git a/statfs64.c b/statfs64.c
index dc051818356beda4ad12d22884cbc21353a69d7a..cd433d51a248d732ec0b0e7d807154f8b1bd6153 100644 (file)
--- a/statfs64.c
+++ b/statfs64.c
@@ -4,7 +4,7 @@ SYS_FUNC(statfs64)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
-               tprintf(", %" PRI_kru ", ", tcp->u_arg[1]);
+               tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
        } else {
                print_struct_statfs64(tcp, tcp->u_arg[2], tcp->u_arg[1]);
        }

diff --git a/syscall.c b/syscall.c
index 6e41c4612db1f23b44c9615fde84c3e411bb6c3d..bc92e5672fd2cc5c070b38c618437aa004e721f4 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("= %#" PRI_krx, tcp->u_rval);
+                       tprintf("= %#" PRI_klx, 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("= %#" PRI_krx, tcp->u_rval);
+                                       tprintf("= %#" PRI_klx, 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("= %" PRI_kru, tcp->u_rval);
+                                       tprintf("= %" PRI_klu, tcp->u_rval);
                                break;
                        case RVAL_DECIMAL:
-                               tprintf("= %" PRI_krd, tcp->u_rval);
+                               tprintf("= %" PRI_kld, 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("= %" PRI_krd, tcp->u_rval);
+                                       tprintf("= %" PRI_kld, tcp->u_rval);
                                break;
 #if HAVE_STRUCT_TCB_EXT_ARG
                        /*
@@ -1059,7 +1059,7 @@ print_pc(struct tcb *tcp)
                                              : "[????????????????] ");
        else
                tprintf(current_wordsize == 4
-                       ? "[%08" PRI_krx "] " : "[%016" PRI_krx "] ",
+                       ? "[%08" PRI_klx "] " : "[%016" PRI_klx "] ",
                        (kernel_ulong_t) ARCH_PC_REG);
 }
 
@@ -1229,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_%" PRI_kru, shuffle_scno(tcp->scno));
+               sprintf(s->buf, "syscall_%" PRI_klu, shuffle_scno(tcp->scno));
 
                tcp->s_ent = &s->ent;
                tcp->qual_flg = QUAL_RAW | DEFAULT_QUAL_FLAGS;
@@ -1237,7 +1237,7 @@ get_scno(struct tcb *tcp)
                set_tcb_priv_data(tcp, s, free_sysent_buf);
 
                if (debug_flag)
-                       error_msg("pid %d invalid syscall %" PRI_krd,
+                       error_msg("pid %d invalid syscall %" PRI_kld,
                                  tcp->pid, tcp->scno);
        }
        return 1;

diff --git a/syslog.c b/syslog.c
index 90f55d31d61a12e940b9f5eb09444ef29c2c6b1e..99063060585d48aea9a3ea9b5ffa79b49a357628 100644 (file)
--- a/syslog.c
+++ b/syslog.c
@@ -62,7 +62,7 @@ SYS_FUNC(syslog)
                        break;
                default:
                        printaddr(tcp->u_arg[1]);
-                       tprintf(", %" PRI_kru, tcp->u_arg[2]);
+                       tprintf(", %" PRI_klu, tcp->u_arg[2]);
                        return RVAL_DECODED;
        }
 

diff --git a/sysmips.c b/sysmips.c
index fae9e6a82e439615e68723146cdf0b50ed8cfdb3..af5ffba0cc3618dd63b080d319e704080e9ac70a 100644 (file)
--- a/sysmips.c
+++ b/sysmips.c
@@ -65,14 +65,14 @@ SYS_FUNC(sysmips)
        }
        case MIPS_ATOMIC_SET:
                printaddr(tcp->u_arg[1]);
-               tprintf(", %#" PRI_krx, tcp->u_arg[2]);
+               tprintf(", %#" PRI_klx, tcp->u_arg[2]);
                return RVAL_DECODED;
        case MIPS_FIXADE:
-               tprintf("%#" PRI_krx, tcp->u_arg[1]);
+               tprintf("%#" PRI_klx, tcp->u_arg[1]);
                return RVAL_DECODED;
        }
 
-       tprintf("%" PRI_krd ", %" PRI_krd ", %" PRI_krd,
+       tprintf("%" PRI_kld ", %" PRI_kld ", %" PRI_kld,
                tcp->u_arg[1], tcp->u_arg[2], tcp->u_arg[3]);
        return RVAL_DECODED;
 }

diff --git a/truncate.c b/truncate.c
index 3d574a3ce51a9e3248858045db0aa1586ae782ec..f18394d97700faa1b53c5fb18c3bec90af3e5bdf 100644 (file)
--- a/truncate.c
+++ b/truncate.c
@@ -3,7 +3,7 @@
 SYS_FUNC(truncate)
 {
        printpath(tcp, tcp->u_arg[0]);
-       tprintf(", %" PRI_kru, tcp->u_arg[1]);
+       tprintf(", %" PRI_klu, tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }
@@ -19,7 +19,7 @@ SYS_FUNC(truncate64)
 SYS_FUNC(ftruncate)
 {
        printfd(tcp, tcp->u_arg[0]);
-       tprintf(", %" PRI_kru, tcp->u_arg[1]);
+       tprintf(", %" PRI_klu, tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }

diff --git a/util.c b/util.c
index 249efee9188d5b7760a59798cbf71e536ea864ac..88af997845fa9ade83e26c608cafa1cfe5b73bc6 100644 (file)
--- a/util.c
+++ b/util.c
@@ -956,7 +956,7 @@ dumpiov_upto(struct tcb *const tcp, const int len, const kernel_ulong_t addr,
                        data_size -= iov_len;
                        /* include the buffer number to make it easy to
                         * match up the trace with the source */
-                       tprintf(" * %" PRI_kru " bytes in buffer %d\n", iov_len, i);
+                       tprintf(" * %" PRI_klu " 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_ulong_t addr, unsigned int len,
                if ((unsigned int) r == len)
                        return 0;
                if (r >= 0) {
-                       error_msg("umoven: short read (%u < %u) @0x%" PRI_krx,
+                       error_msg("umoven: short read (%u < %u) @0x%" PRI_klx,
                                  (unsigned int) r, len, addr);
                        return -1;
                }
@@ -1169,7 +1169,7 @@ umoven(struct tcb *const tcp, kernel_ulong_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%" PRI_krx,
+                               perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
                                            pid, addr);
                                return -1;
                }
@@ -1192,13 +1192,13 @@ umoven(struct tcb *const tcp, kernel_ulong_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%" PRI_krx,
+                                       perror_msg("umoven: short read (%u < %u) @0x%" PRI_klx,
                                                   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%" PRI_krx,
+                               perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
                                            pid, addr);
                                return -1;
                }
@@ -1312,7 +1312,7 @@ umovestr(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len, char *lad
                                case EFAULT: case EIO:
                                        /* address space is inaccessible */
                                        if (nread) {
-                                               perror_msg("umovestr: short read (%d < %d) @0x%" PRI_krx,
+                                               perror_msg("umovestr: short read (%d < %d) @0x%" PRI_klx,
                                                           nread, nread + len, addr - nread);
                                        }
                                        return -1;
@@ -1343,7 +1343,7 @@ umovestr(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len, char *lad
                                return -1;
                        default:
                                /* all the rest is strange and should be reported */
-                               perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%" PRI_krx,
+                               perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
                                            pid, addr);
                                return -1;
                }
@@ -1370,13 +1370,13 @@ umovestr(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len, char *lad
                        case EFAULT: case EIO: case EPERM:
                                /* address space is inaccessible */
                                if (nread) {
-                                       perror_msg("umovestr: short read (%d < %d) @0x%" PRI_krx,
+                                       perror_msg("umovestr: short read (%d < %d) @0x%" PRI_klx,
                                                   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%" PRI_krx,
+                               perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
                                           pid, addr);
                                return -1;
                }

diff --git a/xattr.c b/xattr.c
index 32b7ded80d9c7941f31f4e50fa32dbea3e1b0dd2..e7f550bfff1766ae93453ebf13b4499c98b16114 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(", %" PRI_kru, insize);
+       tprintf(", %" PRI_klu, insize);
 }
 
 SYS_FUNC(setxattr)
@@ -109,7 +109,7 @@ print_xattr_list(struct tcb *const tcp, const kernel_ulong_t addr,
        } else {
                printstrn(tcp, addr, tcp->u_rval);
        }
-       tprintf(", %" PRI_kru, size);
+       tprintf(", %" PRI_klu, size);
 }
 
 SYS_FUNC(listxattr)