]> granicus.if.org Git - strace/commitdiff
v4l2: check for verbose flag in umoven_or_printaddr_ignore_syserror
authorEugene Syromyatnikov <evgsyr@gmail.com>
Fri, 14 Oct 2016 22:56:10 +0000 (01:56 +0300)
committerDmitry V. Levin <ldv@altlinux.org>
Fri, 28 Oct 2016 18:40:10 +0000 (18:40 +0000)
This change makes behaviour of umoven_or_printaddr_ignore_syserror in
line with umoven_or_printaddr when verbose flag is disabled.

* v4l2.c (umoven_or_printaddr_ignore_syserror): Simply call printaddr
when verbose flag is unset.

v4l2.c

diff --git a/v4l2.c b/v4l2.c
index 237766e2faae54589b5646e0755e7c4769213148..aadc3378144e78418be4c050e29355e233c40899 100644 (file)
--- a/v4l2.c
+++ b/v4l2.c
@@ -679,7 +679,7 @@ static int
 umoven_or_printaddr_ignore_syserror(struct tcb *tcp, const long addr,
                                    const unsigned int len, void *our_addr)
 {
-       if (!addr || umoven(tcp, addr, len, our_addr) < 0) {
+       if (!addr || !verbose(tcp) || umoven(tcp, addr, len, our_addr) < 0) {
                printaddr(addr);
                return -1;
        }