Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750854AbbB1JeO (ORCPT ); Sat, 28 Feb 2015 04:34:14 -0500 Received: from terminus.zytor.com ([198.137.202.10]:45101 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751447AbbB1JeJ (ORCPT ); Sat, 28 Feb 2015 04:34:09 -0500 Date: Sat, 28 Feb 2015 01:33:46 -0800 From: tip-bot for Yunlong Song Message-ID: Cc: wangnan0@huawei.com, linux-kernel@vger.kernel.org, mingo@kernel.org, a.p.zijlstra@chello.nl, hpa@zytor.com, yunlong.song@huawei.com, tglx@linutronix.de, acme@redhat.com, paulus@samba.org Reply-To: mingo@kernel.org, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, wangnan0@huawei.com, paulus@samba.org, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, yunlong.song@huawei.com In-Reply-To: <1425032491-20224-7-git-send-email-yunlong.song@huawei.com> References: <1425032491-20224-7-git-send-email-yunlong.song@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Remove the '--(null)' long_name for --list-opts Git-Commit-ID: 3ef1e65c829c86ffaa94a4ed59fed5da37f9610a 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 Content-Length: 2670 Lines: 68 Commit-ID: 3ef1e65c829c86ffaa94a4ed59fed5da37f9610a Gitweb: http://git.kernel.org/tip/3ef1e65c829c86ffaa94a4ed59fed5da37f9610a Author: Yunlong Song AuthorDate: Fri, 27 Feb 2015 18:21:30 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 27 Feb 2015 15:52:14 -0300 perf tools: Remove the '--(null)' long_name for --list-opts If the long_name of a 'struct option' is defined as NULL, --list-opts will incorrectly print '--(null)' in its output. As a result, '--(null)' will finally appear in the case of bash completion, e.g. 'perf record --'. Example: Before this patch: $ perf record --list-opts --event --filter --pid --tid --realtime --no-buffering --raw-samples --all-cpus --cpu --count --output --no-inherit --freq --mmap-pages --group --(null) --call-graph --verbose --quiet --stat --data --timestamp --period --no-samples --no-buildid-cache --no-buildid --cgroup --delay --uid --branch-any --branch-filter --weight --transaction --per-thread --intr-regs After this patch: $ perf record --list-opts --event --filter --pid --tid --realtime --no-buffering --raw-samples --all-cpus --cpu --count --output --no-inherit --freq --mmap-pages --group --call-graph --verbose --quiet --stat --data --timestamp --period --no-samples --no-buildid-cache --no-buildid --cgroup --delay --uid --branch-any --branch-filter --weight --transaction --per-thread --intr-regs Signed-off-by: Yunlong Song Tested-by: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1425032491-20224-7-git-send-email-yunlong.song@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/parse-options.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c index b0ef2d8..1457d66 100644 --- a/tools/perf/util/parse-options.c +++ b/tools/perf/util/parse-options.c @@ -505,7 +505,8 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o break; case PARSE_OPT_LIST_OPTS: while (options->type != OPTION_END) { - printf("--%s ", options->long_name); + if (options->long_name) + printf("--%s ", options->long_name); options++; } putchar('\n'); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/