Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 446fb96c authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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 <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0ba332f7

tools/perf/ui/browsers/hists.c

+6 −5
Original line number Diff line number Diff line
@@ -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,10 +1643,11 @@ 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:

		if (thread != NULL &&

		    asprintf(&options[nr_options], "Zoom %s %s(%d) thread",