p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-oyi6zif3810nwi4uu85odnhv@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2019-06-26 12:45:09 -03:00
parent 2a60689a33
commit af0de0c5f0
3 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/perf/util/dso.c
View File

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <asm/bug.h> #include <asm/bug.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/string.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/types.h> #include <sys/types.h>
@ -394,7 +395,7 @@ int __kmod_path__parse(struct kmod_path *m, const char *path,
return -ENOMEM; return -ENOMEM;
} }
strxfrchar(m->name, '-', '_'); strreplace(m->name, '-', '_');
} }
return 0; return 0;

18
tools/perf/util/string.c
View File

@ -300,24 +300,6 @@ int strtailcmp(const char *s1, const char *s2)
return 0; 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) char *asprintf_expr_inout_ints(const char *var, bool in, size_t nints, int *ints)
{ {
/* /*

1
tools/perf/util/string2.h
View File

@ -21,7 +21,6 @@ static inline bool strisglob(const char *str)
return strpbrk(str, "*?[") != NULL; return strpbrk(str, "*?[") != NULL;
} }
int strtailcmp(const char *s1, const char *s2); 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); char *asprintf_expr_inout_ints(const char *var, bool in, size_t nints, int *ints);