Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 13:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging/lustre/libcfs: remove cfs_iswhite

Browse Source 
Kernel provides isspace().

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peng Tao 2014-03-05 21:27:18 +08:00 committed by Greg Kroah-Hartman
parent 31fb613ad0
commit e525a68118
3 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/lustre/include/linux/libcfs/libcfs_string.h
View File

@ -90,21 +90,6 @@ struct cfs_expr_list {
struct list_head el_exprs;
};
static inline int
cfs_iswhite(char c)
{
switch (c) {
case ' ':
case '\t':
case '\n':
case '\r':
return 1;
default:
break;
}
return 0;
}
char *cfs_trimwhite(char *str);
int cfs_gettok(struct cfs_lstr *next, char delim, struct cfs_lstr *res);
int cfs_str2num_check(char *str, int nob, unsigned *num,

12
drivers/staging/lustre/lnet/lnet/config.c
View File

@ -443,7 +443,7 @@ lnet_str2tbs_sep(struct list_head *tbs, char *str)
/* Split 'str' into separate commands */
for (;;) {
/* skip leading whitespace */
while (cfs_iswhite(*str))
while (isspace(*str))
str++;
/* scan for separator or comment */
@ -460,7 +460,7 @@ lnet_str2tbs_sep(struct list_head *tbs, char *str)
}
for (i = 0; i < nob; i++)
if (cfs_iswhite(str[i]))
if (isspace(str[i]))
ltb->ltb_text[i] = ' ';
else
ltb->ltb_text[i] = str[i];
@ -667,7 +667,7 @@ lnet_parse_route(char *str, int *im_a_router)
sep = str;
for (;;) {
/* scan for token start */
while (cfs_iswhite(*sep))
while (isspace(*sep))
sep++;
if (*sep == 0) {
if (ntokens < (got_hops ? 3 : 2))
@ -679,7 +679,7 @@ lnet_parse_route(char *str, int *im_a_router)
token = sep++;
/* scan for token end */
while (*sep != 0 && !cfs_iswhite(*sep))
while (*sep != 0 && !isspace(*sep))
sep++;
if (*sep != 0)
*sep++ = 0;
@ -858,7 +858,7 @@ lnet_match_network_tokens(char *net_entry, __u32 *ipaddrs, int nip)
sep = tokens;
for (;;) {
/* scan for token start */
while (cfs_iswhite(*sep))
while (isspace(*sep))
sep++;
if (*sep == 0)
break;
@ -866,7 +866,7 @@ lnet_match_network_tokens(char *net_entry, __u32 *ipaddrs, int nip)
token = sep++;
/* scan for token end */
while (*sep != 0 && !cfs_iswhite(*sep))
while (*sep != 0 && !isspace(*sep))
sep++;
if (*sep != 0)
*sep++ = 0;

10
drivers/staging/lustre/lustre/libcfs/libcfs_string.c
View File

@ -143,12 +143,12 @@ cfs_trimwhite(char *str)
{
char *end;
while (cfs_iswhite(*str))
while (isspace(*str))
str++;
end = str + strlen(str);
while (end > str) {
if (!cfs_iswhite(end[-1]))
if (!isspace(end[-1]))
break;
end--;
}
@ -178,7 +178,7 @@ cfs_gettok(struct cfs_lstr *next, char delim, struct cfs_lstr *res)
/* skip leading white spaces */
while (next->ls_len) {
if (!cfs_iswhite(*next->ls_str))
if (!isspace(*next->ls_str))
break;
next->ls_str++;
next->ls_len--;
@ -205,7 +205,7 @@ cfs_gettok(struct cfs_lstr *next, char delim, struct cfs_lstr *res)
/* skip ending whitespaces */
while (--end != res->ls_str) {
if (!cfs_iswhite(*end))
if (!isspace(*end))
break;
}
@ -234,7 +234,7 @@ cfs_str2num_check(char *str, int nob, unsigned *num,
return 0;
for (; endp < str + nob; endp++) {
if (!cfs_iswhite(*endp))
if (!isspace(*endp))
return 0;
}