Skip to contentSkip to conversation

perf probe: Use skip_spaces() for argv handling

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jul 3, 2019 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  ee44b5b51f37727f57962b2cdccd548c62045252
Gitweb:     https://git.kernel.org/tip/ee44b5b51f37727f57962b2cdccd548c62045252
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 25 Jun 2019 21:46:39 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 26 Jun 2019 11:31:37 -0300

perf probe: Use skip_spaces() for argv handling

The skip_sep() routine has the same implementation as skip_spaces(), recently adopted from the kernel, sources, switch to it.

---
 tools/perf/util/string.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)
tools/perf/util/string.c +2 -14
index 084c3e4e9400..d28e723e2790 100644
@@ -69,18 +69,6 @@ out_err:
 	return -1;
 }
 
-/*
- * Helper function for splitting a string into an argv-like array.
- * originally copied from lib/argv_split.c
- */
-static const char *skip_sep(const char *cp)
-{
-	while (*cp && isspace(*cp))
-		cp++;
-
-	return cp;
-}
-
 static const char *skip_arg(const char *cp)
 {
 	while (*cp && !isspace(*cp))
@@ -94,7 +82,7 @@ static int count_argc(const char *str)
 	int count = 0;
 
 	while (*str) {
-		str = skip_sep(str);
+		str = skip_spaces(str);
 		if (*str) {
 			count++;
 			str = skip_arg(str);
@@ -148,7 +136,7 @@ char **argv_split(const char *str, int *argcp)
 	argvp = argv;
 
 	while (*str) {
-		str = skip_sep(str);
+		str = skip_spaces(str);
 
 		if (*str) {
 			const char *p = str;