diff options
author | André Goddard Rosa <andre.goddard@gmail.com> | 2009-12-14 18:01:04 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 08:53:32 -0800 |
commit | f653398c86a1c104f0992bd788dd4bb065449be4 (patch) | |
tree | 69cd79aaca48c2e1bdf9a48b968772347dbd5df2 /include/linux/ctype.h | |
parent | 4e62b0930223fe2f61094ceb1bbb31b3fe4251c2 (diff) | |
download | linux-stable-f653398c86a1c104f0992bd788dd4bb065449be4.tar.gz linux-stable-f653398c86a1c104f0992bd788dd4bb065449be4.tar.bz2 linux-stable-f653398c86a1c104f0992bd788dd4bb065449be4.zip |
string: factorize skip_spaces and export it to be generally available
On the following sentence:
while (*s && isspace(*s))
s++;
If *s == 0, isspace() evaluates to ((_ctype[*s] & 0x20) != 0), which
evaluates to ((0x08 & 0x20) != 0) which equals to 0 as well.
If *s == 1, we depend on isspace() result anyway. In other words,
"a char equals zero is never a space", so remove this check.
Also, *s != 0 is most common case (non-null string).
Fixed const return as noticed by Jan Engelhardt and James Bottomley.
Fixed unnecessary extra cast on strstrip() as noticed by Jan Engelhardt.
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/ctype.h')
-rw-r--r-- | include/linux/ctype.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ctype.h b/include/linux/ctype.h index 6dec944a370b..a3d6ee0044f9 100644 --- a/include/linux/ctype.h +++ b/include/linux/ctype.h @@ -27,6 +27,7 @@ extern const unsigned char _ctype[]; #define islower(c) ((__ismask(c)&(_L)) != 0) #define isprint(c) ((__ismask(c)&(_P|_U|_L|_D|_SP)) != 0) #define ispunct(c) ((__ismask(c)&(_P)) != 0) +/* Note: isspace() must return false for %NUL-terminator */ #define isspace(c) ((__ismask(c)&(_S)) != 0) #define isupper(c) ((__ismask(c)&(_U)) != 0) #define isxdigit(c) ((__ismask(c)&(_D|_X)) != 0) |