io: change size types from unsigned long to kernel_ureg_t

[strace] / kexec.c

diff --git a/kexec.c b/kexec.c
index 128b1dffc15c4a7fa185bf18932126e7b5d5e024..a1f0ccbbad9335b75bf7e23c46b27280fa8b5164 100644 (file)
--- a/kexec.c
+++ b/kexec.c
@@ -53,17 +53,17 @@ print_seg(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
                seg = elem_buf;
        }
 
-       tprints("{");
+       tprints("{buf=");
        printaddr(seg[0]);
-       tprintf(", %lu, ", seg[1]);
+       tprintf(", bufsz=%lu, mem=", seg[1]);
        printaddr(seg[2]);
-       tprintf(", %lu}", seg[3]);
+       tprintf(", memsz=%lu}", seg[3]);
 
        return true;
 }
 
 static void
-print_kexec_segments(struct tcb *tcp, const unsigned long addr,
+print_kexec_segments(struct tcb *const tcp, const kernel_ureg_t addr,
                     const unsigned long len)
 {
        if (len > KEXEC_SEGMENT_MAX) {
@@ -91,7 +91,7 @@ SYS_FUNC(kexec_load)
        /* flags */
        unsigned long n = tcp->u_arg[3];
        printxval_long(kexec_arch_values, n & KEXEC_ARCH_MASK, "KEXEC_ARCH_???");
-       n &= ~KEXEC_ARCH_MASK;
+       n &= ~(unsigned long) KEXEC_ARCH_MASK;
        if (n) {
                tprints("|");
                printflags_long(kexec_load_flags, n, "KEXEC_???");
@@ -111,12 +111,12 @@ SYS_FUNC(kexec_file_load)
        printfd(tcp, tcp->u_arg[1]);
        tprints(", ");
        /* cmdline_len */
-       tprintf("%lu, ", tcp->u_arg[2]);
+       tprintf("%" PRI_klu ", ", getarg_klu(tcp, 2));
        /* cmdline */
-       printstr(tcp, tcp->u_arg[3], tcp->u_arg[2]);
+       printstrn(tcp, tcp->u_arg[3], tcp->u_arg[2]);
        tprints(", ");
        /* flags */
-       printflags_long(kexec_file_load_flags, tcp->u_arg[4], "KEXEC_FILE_???");
+       printflags64(kexec_file_load_flags, getarg_klu(tcp, 4), "KEXEC_FILE_???");
 
        return RVAL_DECODED;
 }