From: Ben Hutchings <ben@decadent.org.uk>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH perf 2/4] perf top: Fix behaviour of Shift-Tab in annotated view with nothing focussed
Date: Tue, 19 Jan 2016 21:32:57 +0000 [thread overview]
Message-ID: <20160119213256.GD2637@decadent.org.uk> (raw)
In-Reply-To: <20160119213213.GB2637@decadent.org.uk>
[-- Attachment #1: Type: text/plain, Size: 1094 bytes --]
gcc 6 catches a case of missing braces:
ui/browsers/annotate.c: In function 'annotate_browser__run':
ui/browsers/annotate.c:760:5: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]
if (nd == NULL)
^~
ui/browsers/annotate.c:758:4: note: ...this 'if' clause, but it is not
if (nd != NULL)
^~
Fixes: c97cf42219b7 ("perf top: Live TUI Annotation")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
tools/perf/ui/browsers/annotate.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index d4d7cc2..718bd46 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -755,11 +755,11 @@ static int annotate_browser__run(struct annotate_browser *browser,
nd = browser->curr_hot;
break;
case K_UNTAB:
- if (nd != NULL)
+ if (nd != NULL) {
nd = rb_next(nd);
if (nd == NULL)
nd = rb_first(&browser->entries);
- else
+ } else
nd = browser->curr_hot;
break;
case K_F1:
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]
next prev parent reply other threads:[~2016-01-19 21:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-19 21:32 [PATCH perf 0/4] Build fixes for gcc 6 Ben Hutchings
2016-01-19 21:32 ` [PATCH perf 1/4] perf tools: Fix wrong indentation and build failure with " Ben Hutchings
2016-01-19 21:32 ` Ben Hutchings [this message]
2016-01-19 21:33 ` [PATCH perf 3/4] perf tools: Fix unused variables: x86_{32,64}_regoffset_table Ben Hutchings
2016-01-20 13:59 ` Arnaldo Carvalho de Melo
2016-01-21 4:43 ` Wangnan (F)
2016-01-21 15:38 ` Arnaldo Carvalho de Melo
2016-01-21 15:41 ` Arnaldo Carvalho de Melo
2016-01-22 1:26 ` Wangnan (F)
2016-01-22 5:56 ` 平松雅巳 / HIRAMATU，MASAMI
2016-01-22 6:19 ` Wangnan (F)
2016-01-22 7:59 ` 平松雅巳 / HIRAMATU，MASAMI
2016-01-19 21:33 ` [PATCH perf 4/4] perf tests: Delete mis-indented dead code that causes build failure with gcc 6 Ben Hutchings
2016-01-19 21:40 ` [PATCH perf 0/4] Build fixes for " Markus Trippelsdorf
2016-01-19 21:58 ` Ben Hutchings
2016-01-19 22:00 ` Markus Trippelsdorf
2016-01-19 22:04 ` Ben Hutchings
2016-01-19 22:28 ` Arnaldo Carvalho de Melo
2016-01-19 22:30 ` Arnaldo Carvalho de Melo
2016-01-19 22:43 ` Markus Trippelsdorf
2016-01-19 22:31 ` Markus Trippelsdorf
2016-01-20 13:20 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160119213256.GD2637@decadent.org.uk \
--to=ben@decadent.org.uk \
--cc=acme@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).