diff options
author | André Goddard Rosa <andre.goddard@gmail.com> | 2010-03-05 16:43:12 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 14:26:35 -0500 |
commit | d6a2eedfddcded92c8f9b0ac022a99c4134696b0 (patch) | |
tree | 6a0f38fbc74e839fc7712f8ebcb65cce75cdcc06 | |
parent | a11d2b64e1f2556953120d516241243ea365f0ae (diff) |
lib/string.c: simplify strnstr()
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Cc: Li Zefan <lizf@cn.fujitsu.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>
-rw-r--r-- | lib/string.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/string.c b/lib/string.c index 0f8624532082..f71bead1be3e 100644 --- a/lib/string.c +++ b/lib/string.c | |||
@@ -689,13 +689,13 @@ EXPORT_SYMBOL(strstr); | |||
689 | */ | 689 | */ |
690 | char *strnstr(const char *s1, const char *s2, size_t len) | 690 | char *strnstr(const char *s1, const char *s2, size_t len) |
691 | { | 691 | { |
692 | size_t l1 = len, l2; | 692 | size_t l2; |
693 | 693 | ||
694 | l2 = strlen(s2); | 694 | l2 = strlen(s2); |
695 | if (!l2) | 695 | if (!l2) |
696 | return (char *)s1; | 696 | return (char *)s1; |
697 | while (l1 >= l2) { | 697 | while (len >= l2) { |
698 | l1--; | 698 | len--; |
699 | if (!memcmp(s1, s2, l2)) | 699 | if (!memcmp(s1, s2, l2)) |
700 | return (char *)s1; | 700 | return (char *)s1; |
701 | s1++; | 701 | s1++; |