summaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2017-04-26 14:49:21 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2017-04-26 14:49:21 -0400
commit96395cbbc7e94cbbe4f76cf64cf122fabc19123d (patch)
treec0cf51cd06c2b98bf45ef786f88c9b662c6645e8 /tools/perf
parent3caeafce5392a8eba7b36d0d097d403cacc66e2d (diff)
tools lib string: Adopt prefixcmp() from perf and subcmd
Both had copies originating from git.git, move those to tools/lib/string.c, getting both tools/lib/subcmd/ and tools/perf/ to use it. Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/n/tip-uidwtticro1qhttzd2rkrkg1@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/strbuf.c9
-rw-r--r--tools/perf/util/util.h2
2 files changed, 0 insertions, 11 deletions
diff --git a/tools/perf/util/strbuf.c b/tools/perf/util/strbuf.c
index e91b5e86f027..aafe908b82b5 100644
--- a/tools/perf/util/strbuf.c
+++ b/tools/perf/util/strbuf.c
@@ -3,15 +3,6 @@
3#include <linux/kernel.h> 3#include <linux/kernel.h>
4#include <errno.h> 4#include <errno.h>
5 5
6int prefixcmp(const char *str, const char *prefix)
7{
8 for (; ; str++, prefix++)
9 if (!*prefix)
10 return 0;
11 else if (*str != *prefix)
12 return (unsigned char)*prefix - (unsigned char)*str;
13}
14
15/* 6/*
16 * Used as the default ->buf value, so that people can always assume 7 * Used as the default ->buf value, so that people can always assume
17 * buf is non NULL and ->buf is NUL terminated even for a freshly 8 * buf is non NULL and ->buf is NUL terminated even for a freshly
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index d620719775a8..5dfb9bb6482d 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -30,8 +30,6 @@ void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
30 30
31void set_warning_routine(void (*routine)(const char *err, va_list params)); 31void set_warning_routine(void (*routine)(const char *err, va_list params));
32 32
33int prefixcmp(const char *str, const char *prefix);
34
35static inline void *zalloc(size_t size) 33static inline void *zalloc(size_t size)
36{ 34{
37 return calloc(1, size); 35 return calloc(1, size);