Skip to contentSkip to conversation

staging/dgap: Use strpbrk() instead of dgap_sindex()

PATCH New Alexander Kuleshov 1 participant 1 message Sep 11, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging/dgap: Use strpbrk() instead of dgap_sindex()

The <linux/string.h> provides strpbrk() function that does the same that the dgap_sindex(). Let's use already defined function instead of writing custom.

---
 drivers/staging/dgap/dgap.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)
drivers/staging/dgap/dgap.c +1 -23
index 9112dd2..ee0f022 100644
@@ -287,28 +287,6 @@ static struct toklist dgap_tlist[] = {
 	{ 0,		NULL }
 };
 
-
-/*
- * dgap_sindex: much like index(), but it looks for a match of any character in
- * the group, and returns that position.
- */
-static char *dgap_sindex(char *string, char *group)
-{
-	char *ptr;
-
-	if (!string || !group)
-		return NULL;
-
-	for (; *string; string++) {
-		for (ptr = group; *ptr; ptr++) {
-			if (*ptr == *string)
-				return string;
-		}
-	}
-
-	return NULL;
-}
-
 /*
  * get a word from the input stream, also keep track of current line number.
  * words are separated by whitespace.
@@ -317,7 +295,7 @@ static char *dgap_getword(char **in)
 {
 	char *ret_ptr = *in;
 
-	char *ptr = dgap_sindex(*in, " \t\n");
+	char *ptr = strpbrk(*in, " \t\n");
 
 	/* If no word found, return null */
 	if (!ptr)
Signature · 1 line
2.5.0