commit d6a2eedfddcded92c8f9b0ac022a99c4134696b0
author André Goddard Rosa <andre.goddard@gmail.com> Fri Mar 05 13:43:12 2010 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Mar 06 11:26:35 2010 -0800
tree 6a0f38fbc74e839fc7712f8ebcb65cce75cdcc06
parent a11d2b64e1f2556953120d516241243ea365f0ae

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>

lib/string.c

diff --git a/lib/string.c b/lib/string.c
index 0f86245..f71bead 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -689,13 +689,13 @@
  */
 char *strnstr(const char *s1, const char *s2, size_t len)
 {
-	size_t l1 = len, l2;
+	size_t l2;
 
 	l2 = strlen(s2);
 	if (!l2)
 		return (char *)s1;
-	while (l1 >= l2) {
-		l1--;
+	while (len >= l2) {
+		len--;
 		if (!memcmp(s1, s2, l2))
 			return (char *)s1;
 		s1++;