perf tools: Drop strxfrchar(), use strreplace() equivalent from kernel
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: af0de0c5f060b1d4eae6033043eb9eafd15aa738 Gitweb: https://git.kernel.org/tip/af0de0c5f060b1d4eae6033043eb9eafd15aa738 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 26 Jun 2019 12:45:09 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 1 Jul 2019 22:50:40 -0300
perf tools: Drop strxfrchar(), use strreplace() equivalent from kernel
No change in behaviour intended, just reducing the codebase and using something available in tools/lib/.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/dso.c | 3 ++- tools/perf/util/string.c | 18 ------------------ tools/perf/util/string2.h | 1 - 3 files changed, 2 insertions(+), 20 deletions(-)
tools/perf/util/dso.c +2 -1
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <asm/bug.h> #include <linux/kernel.h> +#include <linux/string.h> #include <sys/time.h> #include <sys/resource.h> #include <sys/types.h>
@@ -394,7 +395,7 @@ int __kmod_path__parse(struct kmod_path *m, const char *path,return -ENOMEM ; } -strxfrchar (m->name,'-' ,'_' ); +strreplace (m->name,'-' ,'_' ); }return 0 ;
tools/perf/util/string.c +0 -18
@@ -300,24 +300,6 @@ int strtailcmp(const char *s1, const char *s2)return 0 ; } -/** -* strxfrchar - Locate and replace character in @s -* @s: The string to be searched/changed. -* @from: Source character to be replaced. -* @to: Destination character. -* -* Return pointer to the changed string. -*/ -char *strxfrchar (char *s,char from,char to) -{ -char *p = s; - -while ((p =strchr (p, from)) !=NULL ) - *p++ = to; - -return s; -} -char *asprintf_expr_inout_ints (const char *var,bool in,size_t nints,int *ints) {/*
tools/perf/util/string2.h +0 -1
@@ -21,7 +21,6 @@ static inline bool strisglob(const char *str)return strpbrk (str,"*?[" ) !=NULL ; }int strtailcmp (const char *s1,const char *s2); -char *strxfrchar (char *s,char from,char to);char *asprintf_expr_inout_ints (const char *var,bool in,size_t nints,int *ints);