Print kernel_ureg_t and kernel_scno_t using dedicated format strings

[strace] / block.c

diff --git a/block.c b/block.c
index bf02888c2a94f2a1394cc172ca03dab9fd4aba5a..1864b5922fdb00e04e31a605b326f60345b8b58f 100644 (file)
--- a/block.c
+++ b/block.c
@@ -129,7 +129,7 @@ print_blkpg_req(struct tcb *tcp, const struct_blkpg_ioctl_arg *blkpg)
        tprintf(", flags=%d, datalen=%d, data=",
                blkpg->flags, blkpg->datalen);
 
-       if (!umove_or_printaddr(tcp, (kernel_ureg_t) blkpg->data, &p)) {
+       if (!umove_or_printaddr(tcp, ptr_to_kulong(blkpg->data), &p)) {
                tprintf("{start=%" PRId64 ", length=%" PRId64
                        ", pno=%d, devname=",
                        p.start, p.length, p.pno);
@@ -143,14 +143,14 @@ print_blkpg_req(struct tcb *tcp, const struct_blkpg_ioctl_arg *blkpg)
        tprints("}");
 }
 
-MPERS_PRINTER_DECL(int, block_ioctl, struct tcb *tcp,
-                  const unsigned int code, const long arg)
+MPERS_PRINTER_DECL(int, block_ioctl, struct tcb *const tcp,
+                  const unsigned int code, const kernel_ureg_t arg)
 {
        switch (code) {
        /* 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 */