From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 14 Jul 2015 22:03:55 +0000 (+0000)
Subject: umoven_or_printaddr: do not fetch data if not in verbose mode
X-Git-Tag: v4.11~464
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61b7989a01e2645b34ace119bb7340d7b4529ffc;p=strace

umoven_or_printaddr: do not fetch data if not in verbose mode

After this change, umoven_or_printaddr and its callers, including
printnum_* and printpair_*, will not fetch data in !verbose mode.

* util.c (umoven_or_printaddr): Do not call umoven if !verbose.
---

diff --git a/util.c b/util.c
index a7d2bd85..04cf413a 100644
--- a/util.c
+++ b/util.c
@@ -1102,7 +1102,7 @@ umoven_or_printaddr(struct tcb *tcp, const long addr, const unsigned int len,
 		tprints("NULL");
 		return -1;
 	}
-	if ((exiting(tcp) && syserror(tcp)) ||
+	if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
 	    umoven(tcp, addr, len, our_addr) < 0) {
 		tprintf("%#lx", addr);
 		return -1;