]> granicus.if.org Git - strace/commitdiff
tprint_iov*: change address argument type from unsigned long to kernel_ureg_t
authorDmitry V. Levin <ldv@altlinux.org>
Tue, 20 Dec 2016 22:47:02 +0000 (22:47 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Fri, 23 Dec 2016 19:26:57 +0000 (19:26 +0000)
* defs.h (tprint_iov, tprint_iov_upto): Change address argument type
from unsigned long to kernel_ureg_t.
* io.c (tprint_iov, tprint_iov_upto): Likewise.

defs.h
io.c

diff --git a/defs.h b/defs.h
index ffb040e1155c1eff345103caea52e93a11455dcb..03788c7cd51faa98c83c238ed9bb1447d9ab630d 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -657,8 +657,11 @@ extern const char *sprintsigmask_n(const char *, const void *, unsigned int);
 #define tprintsigmask_addr(prefix, mask) \
        tprints(sprintsigmask_n((prefix), (mask), sizeof(mask)))
 extern void printsignal(int);
-extern void tprint_iov_upto(struct tcb *, unsigned long, unsigned long,
-                           enum iov_decode, unsigned long);
+
+extern void
+tprint_iov_upto(struct tcb *, unsigned long len, kernel_ureg_t addr,
+               enum iov_decode, unsigned long data_size);
+
 extern void decode_netlink(struct tcb *, unsigned long, unsigned long);
 extern void tprint_open_modes(unsigned int);
 extern const char *sprint_open_modes(unsigned int);
@@ -758,7 +761,7 @@ printxval_long(const struct xlat *x, const unsigned long val, const char *dflt)
 }
 
 static inline void
-tprint_iov(struct tcb *tcp, unsigned long len, unsigned long addr,
+tprint_iov(struct tcb *tcp, unsigned long len, kernel_ureg_t addr,
           enum iov_decode decode_iov)
 {
        tprint_iov_upto(tcp, len, addr, decode_iov, -1UL);
diff --git a/io.c b/io.c
index a93a56c87a6ed55b0ac73cb96091df510eca7bb1..d225eb6bd6481c47b83c7a700bac210fc1fc54b6 100644 (file)
--- a/io.c
+++ b/io.c
@@ -111,8 +111,9 @@ print_iovec(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
  * Example: recvmsg returing a short read.
  */
 void
-tprint_iov_upto(struct tcb *tcp, unsigned long len, unsigned long addr,
-               enum iov_decode decode_iov, unsigned long data_size)
+tprint_iov_upto(struct tcb *const tcp, const unsigned long len,
+               const kernel_ureg_t addr, const enum iov_decode decode_iov,
+               const unsigned long data_size)
 {
        unsigned long iov[2];
        struct print_iovec_config config =