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.
Unified · Split
| @@ -18,4 +18,6 @@ extern size_t strlcpy(char *dest, const char *src, size_t size); · 17 unmodified lines | |||
| 18 | 18 | ||
| 19 | char *str_error_r(int errnum, char *buf, size_t buflen); | 19 | char *str_error_r(int errnum, char *buf, size_t buflen); |
| 20 | 20 | ||
| 21 | int prefixcmp(const char *str, const char *prefix); | ||
| 22 | |||
| 21 | #endif /* _LINUX_STRING_H_ */ | 23 | #endif /* _LINUX_STRING_H_ */ |
| @@ -87,3 +87,12 @@ size_t __weak strlcpy(char *dest, const char *src, size_t size) · 86 unmodified lines | |||
| 87 | } | 87 | } |
| 88 | return ret; | 88 | return ret; |
| 89 | } | 89 | } |
| 90 | |||
| 91 | int prefixcmp(const char *str, const char *prefix) | ||
| 92 | { | ||
| 93 | for (; ; str++, prefix++) | ||
| 94 | if (!*prefix) | ||
| 95 | return 0; | ||
| 96 | else if (*str != *prefix) | ||
| 97 | return (unsigned char)*prefix - (unsigned char)*str; | ||
| 98 | } | ||
| @@ -1,6 +1,7 @@ | |||
| 1 | #include <stdio.h> | 1 | #include <stdio.h> |
| 2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
| 3 | #include <string.h> | 3 | #include <string.h> |
| 4 | #include <linux/string.h> | ||
| 4 | #include <termios.h> | 5 | #include <termios.h> |
| 5 | #include <sys/ioctl.h> | 6 | #include <sys/ioctl.h> |
| 6 | #include <sys/types.h> | 7 | #include <sys/types.h> |
| @@ -1,4 +1,5 @@ | |||
| 1 | #include <linux/compiler.h> | 1 | #include <linux/compiler.h> |
| 2 | #include <linux/string.h> | ||
| 2 | #include <linux/types.h> | 3 | #include <linux/types.h> |
| 3 | #include <stdio.h> | 4 | #include <stdio.h> |
| 4 | #include <stdlib.h> | 5 | #include <stdlib.h> |
| @@ -79,13 +79,4 @@ static inline void astrcat(char **out, const char *add) · 78 unmodified lines | |||
| 79 | free(tmp); | 79 | free(tmp); |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | static inline int prefixcmp(const char *str, const char *prefix) | ||
| 83 | { | ||
| 84 | for (; ; str++, prefix++) | ||
| 85 | if (!*prefix) | ||
| 86 | return 0; | ||
| 87 | else if (*str != *prefix) | ||
| 88 | return (unsigned char)*prefix - (unsigned char)*str; | ||
| 89 | } | ||
| 90 | |||
| 91 | #endif /* __SUBCMD_UTIL_H */ | 82 | #endif /* __SUBCMD_UTIL_H */ |
| @@ -3,15 +3,6 @@ · 2 unmodified lines | |||
| 3 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 4 | #include <errno.h> | 4 | #include <errno.h> |
| 5 | 5 | ||
| 6 | int 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 |
| @@ -30,8 +30,6 @@ void warning(const char *err, ...) __attribute__((format (printf, 1, 2))); · 29 unmodified lines | |||
| 30 | 30 | ||
| 31 | void set_warning_routine(void (*routine)(const char *err, va_list params)); | 31 | void set_warning_routine(void (*routine)(const char *err, va_list params)); |
| 32 | 32 | ||
| 33 | int prefixcmp(const char *str, const char *prefix); | ||
| 34 | |||
| 35 | static inline void *zalloc(size_t size) | 33 | static inline void *zalloc(size_t size) |
| 36 | { | 34 | { |
| 37 | return calloc(1, size); | 35 | return calloc(1, size); |