From 6caa97f543b5b29e57d22344eac934b8467ec951 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Mon, 19 Dec 2016 21:17:13 +0000 Subject: [PATCH] Make tprint_iov function a static inline wrapper * io.c (tprint_iov): Move ... * defs.h: ... here, add static inline keywords. --- defs.h | 8 +++++++- io.c | 7 ------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/defs.h b/defs.h index acd9115a..06b1dcd3 100644 --- a/defs.h +++ b/defs.h @@ -651,7 +651,6 @@ 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(struct tcb *, unsigned long, unsigned long, enum iov_decode); extern void tprint_iov_upto(struct tcb *, unsigned long, unsigned long, enum iov_decode, unsigned long); extern void decode_netlink(struct tcb *, unsigned long, unsigned long); @@ -748,6 +747,13 @@ printxval_long(const struct xlat *x, const unsigned long val, const char *dflt) return printxvals(val, dflt, x, NULL); } +static inline void +tprint_iov(struct tcb *tcp, unsigned long len, unsigned long addr, + enum iov_decode decode_iov) +{ + tprint_iov_upto(tcp, len, addr, decode_iov, -1UL); +} + #ifdef ALPHA typedef struct { int tv_sec, tv_usec; diff --git a/io.c b/io.c index 713a1ce4..a93a56c8 100644 --- a/io.c +++ b/io.c @@ -122,13 +122,6 @@ tprint_iov_upto(struct tcb *tcp, unsigned long len, unsigned long addr, umoven_or_printaddr_ignore_syserror, print_iovec, &config); } -void -tprint_iov(struct tcb *tcp, unsigned long len, unsigned long addr, - enum iov_decode decode_iov) -{ - tprint_iov_upto(tcp, len, addr, decode_iov, -1UL); -} - SYS_FUNC(readv) { if (entering(tcp)) {