]> granicus.if.org Git - strace/commitdiff
Remove dumpiov wrapper
authorDmitry V. Levin <ldv@altlinux.org>
Wed, 21 Dec 2016 02:16:35 +0000 (02:16 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Wed, 21 Dec 2016 22:25:30 +0000 (22:25 +0000)
* defs.h (dumpiov): Remove.
* syscall.c (dumpio): Use dumpiov_upto instead of dumpiov.

defs.h
syscall.c

diff --git a/defs.h b/defs.h
index 4f177065fdcf2d797443dc05a8d53c66b0579c92..6a1c296698e32aa60634e010f41ebb95b04a865c 100644 (file)
--- 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);
index c27c669da6a012dd907f7ba7341eb920c00fd741..63d3b0017a7d3942d9bcecb43d33d4837359a287 100644 (file)
--- 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);