From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933628AbcHDJcB (ORCPT ); Thu, 4 Aug 2016 05:32:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52044 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933291AbcHDJaH (ORCPT ); Thu, 4 Aug 2016 05:30:07 -0400 Date: Thu, 4 Aug 2016 02:08:37 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, adrian.hunter@intel.com, mingo@kernel.org, dsahern@gmail.com, acme@redhat.com, namhyung@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, wangnan0@huawei.com Reply-To: acme@redhat.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com, jolsa@kernel.org, namhyung@kernel.org, mingo@kernel.org, hpa@zytor.com, adrian.hunter@intel.com, tglx@linutronix.de, dsahern@gmail.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf target: str_error_r() always returns the buffer it receives Git-Commit-ID: ce92834407a465c25c0be1a4a0339c625e44c4db 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: ce92834407a465c25c0be1a4a0339c625e44c4db Gitweb: http://git.kernel.org/tip/ce92834407a465c25c0be1a4a0339c625e44c4db Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 29 Jul 2016 11:54:35 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 29 Jul 2016 11:54:35 -0300 perf target: str_error_r() always returns the buffer it receives So no need for checking if it uses the strerror_r() GNU variant error reporting mechanism, i.e. if it returns a pointer to a immutable string internal to glibc. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Fixes: c8b5f2c96d1b ("tools: Introduce str_error_r()") Link: http://lkml.kernel.org/n/tip-xr83cd4y4r3cn6tq6w4f59jb@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/target.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/perf/util/target.c b/tools/perf/util/target.c index 8cdcf46..21c4d9b 100644 --- a/tools/perf/util/target.c +++ b/tools/perf/util/target.c @@ -122,11 +122,7 @@ int target__strerror(struct target *target, int errnum, BUG_ON(buflen == 0); if (errnum >= 0) { - const char *err = str_error_r(errnum, buf, buflen); - - if (err != buf) - scnprintf(buf, buflen, "%s", err); - + str_error_r(errnum, buf, buflen); return 0; }