9os

commit 833f80f3eb49d9406ad1353471b19895285ab9f5
parent c4516e51fbea7ed0aeeaca9055374cd48e884b5d
Author: Roberto Vargas <roberto.vargas@arm.com>
Date:   Fri, 22 Feb 2019 07:31:16 +0000

[dlang] Remove tokenize()

As we can use the data section then we can use strtok
and remove tokenize().

Change-Id: I8593df3a481c66aa3c578f7812576c5b677c5d95

Diffstat:
M
src/romfw/dlang.c
 | 
26
++------------------------

1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/src/romfw/dlang.c b/src/romfw/dlang.c
@@ -275,37 +275,15 @@ err:
 	return 0;
 }
 
-static char *
-tokenize(char **line, const char *delim)
-{
-	char *s, *t;
-
-	t = *line;
-	if (!t)
-		return NULL;
-
-	s = t + strspn(t, delim);
-	if (*s == '\0')
-		return *line = NULL;
-
-	t = s + strcspn(s, delim);
-	if (*t != '\0')
-		*t++ = '\0';
-	else
-		t = NULL;
-	*line = t;
-
-	return s;
-}
-
 static const struct cmd *
 parse_cmd(char *buf, struct args *args)
 {
 	char *p;
 	const struct cmd *cmd;
+	const static char ws[] = " \t\r";
 
 	args->argc = 0;
-	while ((p = tokenize(&buf, " \t\r")) != NULL) {
+	for (p = strtok(buf, ws); p; p = strtok(NULL, ws)) {
 		if (args->argc == NR_ARGC_MAX)
 			error("too many parameters");
 		args->argv[args->argc++] = p;