mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 13:53:33 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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.

Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Kuleshov 2015-09-12 00:22:15 +06:00 committed by Greg Kroah-Hartman
parent 7e25075e3e
commit b9f7f1d084
1 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/staging/dgap/dgap.c
View file

@ -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)