From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 13 May 2016 14:16:12 +0000 (+0000)
Subject: printsiginfo: remove "verbose" argument
X-Git-Tag: v4.12~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9199ab081b2eb22f2fd73c372d65eb2451ede37;p=strace

printsiginfo: remove "verbose" argument

Remove erroneous use of verbose(tcp) as a printing limit
for already fetched members of siginfo_t structure.

* printsiginfo.h (printsiginfo): Remove boolean argument.
* printsiginfo.c (printsigval): Remove boolean argument, print
si_int and si_ptr members unconditionally.  All callers changed.
(print_si_info): Remove boolean argument, print si_utime and si_stime
members unconditionally.  All callers changed.
(printsiginfo): Remove boolean argument.  All callers changed.
---

diff --git a/printsiginfo.c b/printsiginfo.c
index 596d958a..3e3fb501 100644
--- a/printsiginfo.c
+++ b/printsiginfo.c
@@ -74,14 +74,10 @@ printsigsource(const siginfo_t *sip)
 }
 
 static void
-printsigval(const siginfo_t *sip, bool verbose)
+printsigval(const siginfo_t *sip)
 {
-	if (!verbose)
-		tprints(", ...");
-	else
-		tprintf(", si_value={int=%d, ptr=%#lx}",
-			sip->si_int,
-			(unsigned long) sip->si_ptr);
+	tprintf(", si_value={int=%d, ptr=%#lx}",
+		sip->si_int, (unsigned long) sip->si_ptr);
 }
 
 static void
@@ -133,7 +129,7 @@ print_si_code(int si_signo, int si_code)
 }
 
 static void
-print_si_info(const siginfo_t *sip, bool verbose)
+print_si_info(const siginfo_t *sip)
 {
 	if (sip->si_errno) {
 		tprints(", si_errno=");
@@ -156,13 +152,13 @@ print_si_info(const siginfo_t *sip, bool verbose)
 		case SI_TIMER:
 			tprintf(", si_timerid=%#x, si_overrun=%d",
 				sip->si_timerid, sip->si_overrun);
-			printsigval(sip, verbose);
+			printsigval(sip);
 			break;
 #endif
 		default:
 			printsigsource(sip);
 			if (sip->si_ptr)
-				printsigval(sip, verbose);
+				printsigval(sip);
 			break;
 		}
 	} else {
@@ -174,12 +170,9 @@ print_si_info(const siginfo_t *sip, bool verbose)
 				tprintf("%d", sip->si_status);
 			else
 				printsignal(sip->si_status);
-			if (!verbose)
-				tprints(", ...");
-			else
-				tprintf(", si_utime=%llu, si_stime=%llu",
-					(unsigned long long) sip->si_utime,
-					(unsigned long long) sip->si_stime);
+			tprintf(", si_utime=%llu, si_stime=%llu",
+				(unsigned long long) sip->si_utime,
+				(unsigned long long) sip->si_stime);
 			break;
 		case SIGILL: case SIGFPE:
 		case SIGSEGV: case SIGBUS:
@@ -206,7 +199,7 @@ print_si_info(const siginfo_t *sip, bool verbose)
 			if (sip->si_pid || sip->si_uid)
 				printsigsource(sip);
 			if (sip->si_ptr)
-				printsigval(sip, verbose);
+				printsigval(sip);
 		}
 	}
 }
@@ -215,7 +208,7 @@ print_si_info(const siginfo_t *sip, bool verbose)
 static
 #endif
 void
-printsiginfo(const siginfo_t *sip, bool verbose)
+printsiginfo(const siginfo_t *sip)
 {
 	if (sip->si_signo == 0) {
 		tprints("{}");
@@ -230,7 +223,7 @@ printsiginfo(const siginfo_t *sip, bool verbose)
 #ifdef SI_NOINFO
 	if (sip->si_code != SI_NOINFO)
 #endif
-		print_si_info(sip, verbose);
+		print_si_info(sip);
 
 	tprints("}");
 }
@@ -240,16 +233,13 @@ MPERS_PRINTER_DECL(void, printsiginfo_at)(struct tcb *tcp, long addr)
 	siginfo_t si;
 
 	if (!umove_or_printaddr(tcp, addr, &si))
-		printsiginfo(&si, verbose(tcp));
+		printsiginfo(&si);
 }
 
 static bool
 print_siginfo_t(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
 {
-	const siginfo_t *si = elem_buf;
-
-	printsiginfo(si, verbose(tcp));
-
+	printsiginfo((const siginfo_t *) elem_buf);
 	return true;
 }
 
diff --git a/printsiginfo.h b/printsiginfo.h
index b36b3d69..cb2d99d7 100644
--- a/printsiginfo.h
+++ b/printsiginfo.h
@@ -1 +1 @@
-extern void printsiginfo(const siginfo_t *, bool);
+extern void printsiginfo(const siginfo_t *);
diff --git a/strace.c b/strace.c
index 49d6f3d6..4ba88c4c 100644
--- a/strace.c
+++ b/strace.c
@@ -2066,7 +2066,7 @@ print_stopped(struct tcb *tcp, const siginfo_t *si, const unsigned int sig)
 		printleader(tcp);
 		if (si) {
 			tprintf("--- %s ", signame(sig));
-			printsiginfo(si, verbose(tcp));
+			printsiginfo(si);
 			tprints(" ---\n");
 		} else
 			tprintf("--- stopped by %s ---\n", signame(sig));