From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752550AbdK2Gcy (ORCPT ); Wed, 29 Nov 2017 01:32:54 -0500 Received: from terminus.zytor.com ([65.50.211.136]:50207 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbdK2Gcv (ORCPT ); Wed, 29 Nov 2017 01:32:51 -0500 Date: Tue, 28 Nov 2017 22:30:37 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: namhyung@kernel.org, hpa@zytor.com, jolsa@kernel.org, uneedsihyeon@gmail.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, treeze.taeung@gmail.com, acme@redhat.com, mingo@kernel.org Reply-To: hpa@zytor.com, namhyung@kernel.org, tglx@linutronix.de, uneedsihyeon@gmail.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, treeze.taeung@gmail.com, acme@redhat.com In-Reply-To: <20171114001542.GA16464@sejong> References: <20171114001542.GA16464@sejong> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf help: Fix a bug during strstart() conversion Git-Commit-ID: af98f2273fd0af31ce327cd1406b67c7be0b6734 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: af98f2273fd0af31ce327cd1406b67c7be0b6734 Gitweb: https://git.kernel.org/tip/af98f2273fd0af31ce327cd1406b67c7be0b6734 Author: Namhyung Kim AuthorDate: Tue, 14 Nov 2017 09:15:42 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 28 Nov 2017 14:21:18 -0300 perf help: Fix a bug during strstart() conversion The commit 8e99b6d4533c changed prefixcmp() to strstart() but missed to change the return value in some place. It makes perf help print annoying output even for sane config items like below: $ perf help '.root': unsupported man viewer sub key. ... Reported-by: Arnaldo Carvalho de Melo Signed-off-by: Namhyung Kim Tested-by: Arnaldo Carvalho de Melo Tested-by: Taeung Song Cc: Jiri Olsa Cc: Sihyeon Jang Cc: kernel-team@lge.com Link: http://lkml.kernel.org/r/20171114001542.GA16464@sejong Fixes: 8e99b6d4533c ("tools include: Adopt strstarts() from the kernel") Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-help.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c index bd1fede..a0f7ed2 100644 --- a/tools/perf/builtin-help.c +++ b/tools/perf/builtin-help.c @@ -284,7 +284,7 @@ static int perf_help_config(const char *var, const char *value, void *cb) add_man_viewer(value); return 0; } - if (!strstarts(var, "man.")) + if (strstarts(var, "man.")) return add_man_viewer_info(var, value); return 0; @@ -314,7 +314,7 @@ static const char *cmd_to_page(const char *perf_cmd) if (!perf_cmd) return "perf"; - else if (!strstarts(perf_cmd, "perf")) + else if (strstarts(perf_cmd, "perf")) return perf_cmd; return asprintf(&s, "perf-%s", perf_cmd) < 0 ? NULL : s;