From 13d22f1aa3a1beba79a8febb3770f75e646211a8 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 24 Jun 2011 23:01:57 +0200 Subject: [PATCH] Trivial cleanups * strace.c (trace): Change ifdef LINUX to make a bit more sense, remove wrong comment at its endif. Slightly optimize "+++ killed by SIG +++" message for systems without WCOREDUMP macro. Signed-off-by: Denys Vlasenko --- strace.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/strace.c b/strace.c index bc1b00ec..7314d4ad 100644 --- a/strace.c +++ b/strace.c @@ -2488,12 +2488,12 @@ Process %d attached (waiting for parent)\n", /* set current output file */ outf = tcp->outf; curcol = tcp->curcol; - if (cflag) { #ifdef LINUX + if (cflag) { tv_sub(&tcp->dtime, &ru.ru_stime, &tcp->stime); tcp->stime = ru.ru_stime; -#endif /* !LINUX */ } +#endif if (tcp->flags & TCB_SUSPENDED) { /* @@ -2512,12 +2512,14 @@ Process %d attached (waiting for parent)\n", if (cflag != CFLAG_ONLY_STATS && (qual_flags[WTERMSIG(status)] & QUAL_SIGNAL)) { printleader(tcp); +#ifdef WCOREDUMP tprintf("+++ killed by %s %s+++", signame(WTERMSIG(status)), -#ifdef WCOREDUMP - WCOREDUMP(status) ? "(core dumped) " : + WCOREDUMP(status) ? "(core dumped) " : ""); +#else + tprintf("+++ killed by %s +++", + signame(WTERMSIG(status))); #endif - ""); printtrailer(); } #ifdef TCB_GROUP_EXITING -- 2.50.1