diff options
| author | André Goddard Rosa <andre.goddard@gmail.com> | 2010-03-05 13:43:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 11:26:35 -0800 |
| commit | a11d2b64e1f2556953120d516241243ea365f0ae (patch) | |
| tree | efb406b16a33fedf9c239fd6c09d8fe74b0042b7 /lib/string.c | |
| parent | 8a6e25357d51d6ecf4ee21e9048f0416a085a79c (diff) | |
| download | linux-stable-a11d2b64e1f2556953120d516241243ea365f0ae.tar.gz linux-stable-a11d2b64e1f2556953120d516241243ea365f0ae.tar.bz2 linux-stable-a11d2b64e1f2556953120d516241243ea365f0ae.zip | |
lib/string.c: simplify stricmp()
Removes 32 bytes on core2 with gcc 4.4.1:
text data bss dec hex filename
3196 0 0 3196 c7c lib/string-BEFORE.o
3164 0 0 3164 c5c lib/string-AFTER.o
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Cc: Joe Perches <joe@perches.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'lib/string.c')
| -rw-r--r-- | lib/string.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/lib/string.c b/lib/string.c index a1cdcfcc42d0..0f8624532082 100644 --- a/lib/string.c +++ b/lib/string.c @@ -36,25 +36,21 @@ int strnicmp(const char *s1, const char *s2, size_t len) /* Yes, Virginia, it had better be unsigned */ unsigned char c1, c2; - c1 = c2 = 0; - if (len) { - do { - c1 = *s1; - c2 = *s2; - s1++; - s2++; - if (!c1) - break; - if (!c2) - break; - if (c1 == c2) - continue; - c1 = tolower(c1); - c2 = tolower(c2); - if (c1 != c2) - break; - } while (--len); - } + if (!len) + return 0; + + do { + c1 = *s1++; + c2 = *s2++; + if (!c1 || !c2) + break; + if (c1 == c2) + continue; + c1 = tolower(c1); + c2 = tolower(c2); + if (c1 != c2) + break; + } while (--len); return (int)c1 - (int)c2; } EXPORT_SYMBOL(strnicmp); |