From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935089AbeBMMV5 (ORCPT ); Tue, 13 Feb 2018 07:21:57 -0500 Received: from terminus.zytor.com ([198.137.202.136]:49827 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934994AbeBMMVy (ORCPT ); Tue, 13 Feb 2018 07:21:54 -0500 Date: Tue, 13 Feb 2018 04:11:49 -0800 From: tip-bot for Andy Shevchenko Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, andriy.shevchenko@linux.intel.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, acme@redhat.com, hpa@zytor.com Reply-To: jolsa@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, andriy.shevchenko@linux.intel.com In-Reply-To: <20180129130359.1490-1-andriy.shevchenko@linux.intel.com> References: <20180129130359.1490-1-andriy.shevchenko@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Substitute yet another strtoull() Git-Commit-ID: a70770d9b64ab4a36008d64542fb3bb6600c7b07 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: a70770d9b64ab4a36008d64542fb3bb6600c7b07 Gitweb: https://git.kernel.org/tip/a70770d9b64ab4a36008d64542fb3bb6600c7b07 Author: Andy Shevchenko AuthorDate: Mon, 29 Jan 2018 15:03:59 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 6 Feb 2018 10:11:52 -0300 perf tools: Substitute yet another strtoull() Instead of home grown function let's use what library provides us. Signed-off-by: Andriy Shevchenko Acked-by: Jiri Olsa Link: http://lkml.kernel.org/r/20180129130359.1490-1-andriy.shevchenko@linux.intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/util.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index 443892d..1019bbc 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -340,35 +340,15 @@ size_t hex_width(u64 v) return n; } -static int hex(char ch) -{ - if ((ch >= '0') && (ch <= '9')) - return ch - '0'; - if ((ch >= 'a') && (ch <= 'f')) - return ch - 'a' + 10; - if ((ch >= 'A') && (ch <= 'F')) - return ch - 'A' + 10; - return -1; -} - /* * While we find nice hex chars, build a long_val. * Return number of chars processed. */ int hex2u64(const char *ptr, u64 *long_val) { - const char *p = ptr; - *long_val = 0; - - while (*p) { - const int hex_val = hex(*p); + char *p; - if (hex_val < 0) - break; - - *long_val = (*long_val << 4) | hex_val; - p++; - } + *long_val = strtoull(ptr, &p, 16); return p - ptr; }