From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752828AbbLNINV (ORCPT ); Mon, 14 Dec 2015 03:13:21 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52095 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751014AbbLNINT (ORCPT ); Mon, 14 Dec 2015 03:13:19 -0500 Date: Mon, 14 Dec 2015 00:12:50 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: jolsa@redhat.com, tglx@linutronix.de, mingo@kernel.org, acme@redhat.com, hpa@zytor.com, namhyung@kernel.org, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, jpoimboe@redhat.com, dsahern@gmail.com Reply-To: linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, dsahern@gmail.com, jpoimboe@redhat.com, namhyung@kernel.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, acme@redhat.com, jolsa@redhat.com In-Reply-To: <1449716459-23004-2-git-send-email-namhyung@kernel.org> References: <1449716459-23004-2-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Check argument before calling setup_browser() Git-Commit-ID: 50e19ef978158a3d1f790568eccd8e4a802190c2 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: 50e19ef978158a3d1f790568eccd8e4a802190c2 Gitweb: http://git.kernel.org/tip/50e19ef978158a3d1f790568eccd8e4a802190c2 Author: Namhyung Kim AuthorDate: Thu, 10 Dec 2015 12:00:53 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 10 Dec 2015 14:32:33 -0300 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: Namhyung Kim Reviewed-by: Josh Poimboeuf Tested-by: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1449716459-23004-2-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-annotate.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 2bf9b3f..55f6f8d 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -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: