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

Commit 50e19ef9 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate: Check argument before calling setup_browser() 



This is necessary to get rid of the browser dependency from
usage_with_options() and its friends.  Because there's no code changing
the argc and argv, it'd be ok to check it early.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Reviewed-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1449716459-23004-2-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d18929e9

tools/perf/builtin-annotate.c

+10 −11
Original line number Diff line number Diff line
@@ -343,6 +343,16 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) 
		return ret;



	argc = parse_options(argc, argv, options, annotate_usage, 0);

	if (argc) {

		/*

		 * Special case: if there's an argument left then assume that

		 * it's a symbol filter:

		 */

		if (argc > 1)

			usage_with_options(annotate_usage, options);



		annotate.sym_hist_filter = argv[0];

	}



	if (annotate.use_stdio)

		use_browser = 0;
@@ -369,17 +379,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) 
	if (setup_sorting() < 0)

		usage_with_options(annotate_usage, options);



	if (argc) {

		/*

		 * Special case: if there's an argument left then assume that

		 * it's a symbol filter:

		 */

		if (argc > 1)

			usage_with_options(annotate_usage, options);



		annotate.sym_hist_filter = argv[0];

	}



	ret = __cmd_annotate(&annotate);



out_delete: