From 5c252f970dfe14f2b3bb6908b23e6825dab8863c Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 20 Dec 2016 22:47:02 +0000 Subject: [PATCH] tprint_iov*: change address argument type from unsigned long to kernel_ureg_t * 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 | 9 ++++++--- io.c | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/defs.h b/defs.h index ffb040e1..03788c7c 100644 --- 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 a93a56c8..d225eb6b 100644 --- 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 = -- 2.40.0