tools lib string: Adopt prefixcmp() from perf and subcmd

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message May 3, 2017 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2017-05-03 17:39 UTC #0 lore raw

Commit-ID:  96395cbbc7e94cbbe4f76cf64cf122fabc19123d
Gitweb:     http://git.kernel.org/tip/96395cbbc7e94cbbe4f76cf64cf122fabc19123d
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Wed, 26 Apr 2017 15:49:21 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 26 Apr 2017 15:49:21 -0300

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 <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Josh Poimboeuf <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/include/linux/string.h     | 2 ++
 tools/lib/string.c               | 9 +++++++++
 tools/lib/subcmd/help.c          | 1 +
 tools/lib/subcmd/parse-options.c | 1 +
 tools/lib/subcmd/subcmd-util.h   | 9 ---------
 tools/perf/util/strbuf.c         | 9 ---------
 tools/perf/util/util.h           | 2 --
 7 files changed, 13 insertions(+), 20 deletions(-)

tools/include/linux/string.h +2 -0

index f436d24..d62b56c 100644
@@ -18,4 +18,6 @@ extern size_t strlcpy(char *dest, const char *src, size_t size);
 
 char *str_error_r(int errnum, char *buf, size_t buflen);
 
+int prefixcmp(const char *str, const char *prefix);
+
 #endif /* _LINUX_STRING_H_ */

tools/lib/string.c +9 -0

index bd239bc..8e678af 100644
@@ -87,3 +87,12 @@ size_t __weak strlcpy(char *dest, const char *src, size_t size)
 	}
 	return ret;
 }
+
+int prefixcmp(const char *str, const char *prefix)
+{
+	for (; ; str++, prefix++)
+		if (!*prefix)
+			return 0;
+		else if (*str != *prefix)
+			return (unsigned char)*prefix - (unsigned char)*str;
+}

tools/lib/subcmd/help.c +1 -0

index e228c3c..ba970a7 100644
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <linux/string.h>
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>

tools/lib/subcmd/parse-options.c +1 -0

index 6bc2402..359bfa7 100644
@@ -1,4 +1,5 @@
 #include <linux/compiler.h>
+#include <linux/string.h>
 #include <linux/types.h>
 #include <stdio.h>
 #include <stdlib.h>

tools/lib/subcmd/subcmd-util.h +0 -9

index fc2e45d..8fa5f03 100644
@@ -79,13 +79,4 @@ static inline void astrcat(char **out, const char *add)
 	free(tmp);
 }
 
-static inline int prefixcmp(const char *str, const char *prefix)
-{
-	for (; ; str++, prefix++)
-		if (!*prefix)
-			return 0;
-		else if (*str != *prefix)
-			return (unsigned char)*prefix - (unsigned char)*str;
-}
-
 #endif /* __SUBCMD_UTIL_H */

tools/perf/util/strbuf.c +0 -9

index e91b5e8..aafe908 100644
@@ -3,15 +3,6 @@
 #include <linux/kernel.h>
 #include <errno.h>
 
-int prefixcmp(const char *str, const char *prefix)
-{
-	for (; ; str++, prefix++)
-		if (!*prefix)
-			return 0;
-		else if (*str != *prefix)
-			return (unsigned char)*prefix - (unsigned char)*str;
-}
-
 /*
  * Used as the default ->buf value, so that people can always assume
  * buf is non NULL and ->buf is NUL terminated even for a freshly

tools/perf/util/util.h +0 -2

index d620719..5dfb9bb 100644
@@ -30,8 +30,6 @@ void warning(const char *err, ...) __attribute__((format (printf, 1, 2)));
 
 void set_warning_routine(void (*routine)(const char *err, va_list params));
 
-int prefixcmp(const char *str, const char *prefix);
-
 static inline void *zalloc(size_t size)
 {
 	return calloc(1, size);