From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752355AbcEAHi1 (ORCPT ); Sun, 1 May 2016 03:38:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40236 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752272AbcEAHi0 (ORCPT ); Sun, 1 May 2016 03:38:26 -0400 Date: Sun, 1 May 2016 00:38:07 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, tglx@linutronix.de, hpa@zytor.com, milian.wolff@kdab.com, acme@redhat.com, jolsa@kernel.org, adrian.hunter@intel.com, dsahern@gmail.com, wangnan0@huawei.com Reply-To: acme@redhat.com, jolsa@kernel.org, adrian.hunter@intel.com, dsahern@gmail.com, wangnan0@huawei.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, namhyung@kernel.org, hpa@zytor.com, milian.wolff@kdab.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf evsel: Remove two extraneous ending newlines in open_strerror() Git-Commit-ID: 81d64f46d41c428474c64e5c59e5458b7f50d9fd 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: 81d64f46d41c428474c64e5c59e5458b7f50d9fd Gitweb: http://git.kernel.org/tip/81d64f46d41c428474c64e5c59e5458b7f50d9fd Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 27 Apr 2016 17:56:53 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 28 Apr 2016 09:58:58 -0300 perf evsel: Remove two extraneous ending newlines in open_strerror() The error messages returned by this method should not have an ending newline, fix the two cases where it was. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Milian Wolff Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-8af0pazzhzl3dluuh8p7ar7p@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evsel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 9bed7f4..3371721 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -2336,7 +2336,7 @@ int perf_evsel__open_strerror(struct perf_evsel *evsel, struct target *target, case ENODEV: if (target->cpu_list) return scnprintf(msg, size, "%s", - "No such device - did you specify an out-of-range profile CPU?\n"); + "No such device - did you specify an out-of-range profile CPU?"); break; case EOPNOTSUPP: if (evsel->attr.precise_ip) @@ -2368,7 +2368,7 @@ int perf_evsel__open_strerror(struct perf_evsel *evsel, struct target *target, return scnprintf(msg, size, "The sys_perf_event_open() syscall returned with %d (%s) for event (%s).\n" "/bin/dmesg may provide additional information.\n" - "No CONFIG_PERF_EVENTS=y kernel support configured?\n", + "No CONFIG_PERF_EVENTS=y kernel support configured?", err, strerror_r(err, sbuf, sizeof(sbuf)), perf_evsel__name(evsel)); }