From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751872AbbCVKFI (ORCPT ); Sun, 22 Mar 2015 06:05:08 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56790 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751777AbbCVKFB (ORCPT ); Sun, 22 Mar 2015 06:05:01 -0400 Date: Sun, 22 Mar 2015 03:04:47 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@redhat.com, fweisbec@gmail.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, hpa@zytor.com, acme@redhat.com, dzickus@redhat.com, tglx@linutronix.de, namhyung@kernel.org, adrian.hunter@intel.com, eranian@google.com, bp@suse.de, mingo@kernel.org Reply-To: bp@suse.de, mingo@kernel.org, eranian@google.com, namhyung@kernel.org, tglx@linutronix.de, dzickus@redhat.com, adrian.hunter@intel.com, dsahern@gmail.com, fweisbec@gmail.com, jolsa@redhat.com, acme@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists browser: Fix up some branch alignment Git-Commit-ID: 446fb96c4a72ba390fbdecf27a88eaa50ea179dc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 446fb96c4a72ba390fbdecf27a88eaa50ea179dc Gitweb: http://git.kernel.org/tip/446fb96c4a72ba390fbdecf27a88eaa50ea179dc Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 16 Mar 2015 17:46:57 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian echo Link: http://lkml.kernel.org/n/tip-`ranpwd -l 24`@git.kernel.org Link: http://lkml.kernel.org/n/tip-nqgs07jfphbkw67wja870d3r@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index f69371b..ebd9d3a 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -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: