summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2018-01-29 15:03:59 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2018-02-15 09:57:19 -0300
commit6677d26c8befa462eab9be6c5335a939011e7e65 (patch)
tree0a73af32a57be9e549ca2ffd55dd71225f441dd5
parent8cc42de736b617827a4e7664fb8d7a325bc125bc (diff)
downloadlinux-stable-6677d26c8befa462eab9be6c5335a939011e7e65.tar.gz
linux-stable-6677d26c8befa462eab9be6c5335a939011e7e65.tar.bz2
linux-stable-6677d26c8befa462eab9be6c5335a939011e7e65.zip
perf tools: Substitute yet another strtoull()
Instead of home grown function let's use what library provides us. Signed-off-by: Andriy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Jiri Olsa <jolsa@kernel.org> Link: http://lkml.kernel.org/r/20180129130359.1490-1-andriy.shevchenko@linux.intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/util/util.c24
1 files changed, 2 insertions, 22 deletions
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 443892dabedb..1019bbc5dbd8 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;
}