Introduce generic STRINGIFY and STRINGIFY_VAL macros

[strace] / aio.c

diff --git a/aio.c b/aio.c
index 6ff209219e14089fcea74aef1c2915891cde3a50..7adb20df758a9d4ce7e88c85ae528aeef5778d00 100644 (file)
--- a/aio.c
+++ b/aio.c
@@ -3,6 +3,7 @@
  * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
  * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
  * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * Copyright (c) 1999-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -73,7 +74,8 @@ tprint_lio_opcode(unsigned cmd)
                tprints(cmds[cmd].name);
                return cmds[cmd].sub;
        }
-       tprintf("%u /* SUB_??? */", cmd);
+       tprintf("%u", cmd);
+       tprints_comment("SUB_???");
        return SUB_NONE;
 }
 
@@ -87,7 +89,7 @@ print_common_flags(struct tcb *tcp, const struct iocb *cb)
                printfd(tcp, cb->aio_resfd);
        }
        if (cb->aio_flags & ~IOCB_FLAG_RESFD)
-               tprintf(", flags=%x", cb->aio_flags);
+               tprintf(", flags=%#x", cb->aio_flags);
 #endif
 }
 
@@ -130,7 +132,7 @@ print_iocb(struct tcb *tcp, const struct iocb *cb)
        case SUB_COMMON:
                if (cb->aio_lio_opcode == 1 && iocb_is_valid(cb)) {
                        tprints(", str=");
-                       printstr(tcp, cb->aio_buf, cb->aio_nbytes);
+                       printstrn(tcp, cb->aio_buf, cb->aio_nbytes);
                } else {
                        tprintf(", buf=%#" PRIx64, (uint64_t) cb->aio_buf);
                }
@@ -161,13 +163,13 @@ print_iocb(struct tcb *tcp, const struct iocb *cb)
 static bool
 print_iocbp(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-       kernel_ureg_t addr;
+       kernel_ulong_t addr;
        struct iocb cb;
 
-       if (elem_size < sizeof(kernel_ureg_t)) {
-               addr = * (unsigned int *) elem_buf;
+       if (elem_size < sizeof(kernel_ulong_t)) {
+               addr = *(unsigned int *) elem_buf;
        } else {
-               addr = * (kernel_ureg_t *) elem_buf;
+               addr = *(kernel_ulong_t *) elem_buf;
        }
 
        tprints("{");
@@ -180,12 +182,13 @@ print_iocbp(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 
 SYS_FUNC(io_submit)
 {
-       const long nr = widen_to_long(tcp->u_arg[1]);
-       const kernel_ureg_t addr = tcp->u_arg[2];
-       kernel_ureg_t iocbp;
+       const kernel_long_t nr =
+               truncate_klong_to_current_wordsize(tcp->u_arg[1]);
+       const kernel_ulong_t addr = tcp->u_arg[2];
+       kernel_ulong_t iocbp;
 
        printaddr(tcp->u_arg[0]);
-       tprintf(", %ld, ", nr);
+       tprintf(", %" PRI_kld ", ", nr);
 
        if (nr < 0)
                printaddr(addr);
@@ -236,9 +239,9 @@ SYS_FUNC(io_getevents)
 {
        if (entering(tcp)) {
                printaddr(tcp->u_arg[0]);
-               tprintf(", %ld, %ld, ",
-                       widen_to_long(tcp->u_arg[1]),
-                       widen_to_long(tcp->u_arg[2]));
+               tprintf(", %" PRI_kld ", %" PRI_kld ", ",
+                       truncate_klong_to_current_wordsize(tcp->u_arg[1]),
+                       truncate_klong_to_current_wordsize(tcp->u_arg[2]));
        } else {
                struct io_event buf;
                print_array(tcp, tcp->u_arg[3], tcp->u_rval, &buf, sizeof(buf),