svn commit: r205108 - head/lib/libc/string

[Xin LI]

Author: delphij
Date: Sat Mar 13 00:15:06 2010
New Revision: 205108
URL: http://svn.freebsd.org/changeset/base/205108

Log:
  Correct bugs fixed but not merged from my own tree.
  
  Pointy hat to:	delphij
  MFC after:	1 month

Modified:
  head/lib/libc/string/strlen.c

Modified: head/lib/libc/string/strlen.c
==============================================================================
--- head/lib/libc/string/strlen.c	Fri Mar 12 23:57:27 2010	(r205107)
+++ head/lib/libc/string/strlen.c	Sat Mar 13 00:15:06 2010	(r205108)
@@ -99,14 +99,15 @@ strlen(const char *str)
 	lp = (const unsigned long *)((uintptr_t)str & ~LONGPTR_MASK);
 	va = (*lp - mask01);
 	vb = ((~*lp) & mask80);
+	lp++;
 	if (va & vb)
 		/* Check if we have \0 in the first part */
-		for (p = str; (uintptr_t)p & LONGPTR_MASK; p++)
+		for (p = str; p < (const char *)lp; p++)
 			if (*p == '\0')
 				return (p - str);
 
 	/* Scan the rest of the string using word sized operation */
-	for (lp = (const unsigned long *)p; ; lp++) {
+	for (; ; lp++) {
 		va = (*lp - mask01);
 		vb = ((~*lp) & mask80);
 		if (va & vb) {