From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 21 Dec 2016 02:16:35 +0000 (+0000)
Subject: Remove dumpiov wrapper
X-Git-Tag: v4.16~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73be1d7e2ea05b1d197a095af18fc5cf9e5f6cb2;p=strace

Remove dumpiov wrapper

* defs.h (dumpiov): Remove.
* syscall.c (dumpio): Use dumpiov_upto instead of dumpiov.
---

diff --git a/defs.h b/defs.h
index 4f177065..6a1c2966 100644
--- a/defs.h
+++ b/defs.h
@@ -594,8 +594,6 @@ extern void print_numeric_long_umask(unsigned long);
 extern void dumpiov_in_msghdr(struct tcb *, long, unsigned long);
 extern void dumpiov_in_mmsghdr(struct tcb *, long);
 extern void dumpiov_upto(struct tcb *, int, long, unsigned long);
-#define dumpiov(tcp, len, addr) \
-	dumpiov_upto((tcp), (len), (addr), -1UL)
 extern void dumpstr(struct tcb *, long, int);
 extern void printstr_ex(struct tcb *, long addr, long len,
 	unsigned int user_style);
diff --git a/syscall.c b/syscall.c
index c27c669d..63d3b001 100644
--- a/syscall.c
+++ b/syscall.c
@@ -491,7 +491,7 @@ dumpio(struct tcb *tcp)
 		case SEN_pwritev:
 		case SEN_pwritev2:
 		case SEN_vmsplice:
-			dumpiov(tcp, tcp->u_arg[2], tcp->u_arg[1]);
+			dumpiov_upto(tcp, tcp->u_arg[2], tcp->u_arg[1], -1);
 			break;
 		case SEN_sendmsg:
 			dumpiov_in_msghdr(tcp, tcp->u_arg[1], -1UL);