perf hists browser: Fix up some branch alignment
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 446fb96c4a72ba390fbdecf27a88eaa50ea179dc Gitweb: http://git.kernel.org/tip/446fb96c4a72ba390fbdecf27a88eaa50ea179dc Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 16 Mar 2015 17:46:57 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 16 Mar 2015 17:46:57 -0300
perf hists browser: Fix up some branch alignment
Those asprintf return checks should be aligned with the other conditionals, fix it.
Also add {} blocks to further clarify.
Cc: Adrian Hunter <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Don Zickus <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Stephane Eranian <[email protected]>
echo Link: http://lkml.kernel.org/n/tip-ranpwd -l 24@git.kernel.org
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/ui/browsers/hists.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
tools/perf/ui/browsers/hists.c +6 -5
@@ -1623,17 +1623,17 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,if (bi->from.sym !=NULL && !bi->from.map->dso->annotate_warned && -asprintf (&options[nr_options],"Annotate %s" , - bi->from.sym->name) >0 ) +asprintf (&options[nr_options],"Annotate %s" , bi->from.sym->name) >0 ) { annotate_f = nr_options++; + }if (bi->to.sym !=NULL && !bi->to.map->dso->annotate_warned && (bi->to.sym != bi->from.sym || bi->to.map->dso != bi->from.map->dso) && -asprintf (&options[nr_options],"Annotate %s" , - bi->to.sym->name) >0 ) +asprintf (&options[nr_options],"Annotate %s" , bi->to.sym->name) >0 ) { annotate_t = nr_options++; + } }else {if (browser->selection->sym !=NULL && !browser->selection->map->dso->annotate_warned) {
@@ -1643,8 +1643,9 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,if (notes->src &&asprintf (&options[nr_options],"Annotate %s" , - browser->selection->sym->name) >0 ) + browser->selection->sym->name) >0 ) { annotate = nr_options++; + } } } skip_annotation: