diff options
author | wtc%google.com <devnull@localhost> | 2008-06-01 18:28:06 +0000 |
---|---|---|
committer | wtc%google.com <devnull@localhost> | 2008-06-01 18:28:06 +0000 |
commit | 561d44c01ba232a77c7108f9aca20d17ae669486 (patch) | |
tree | 9a6c1c351b3e2682e246e73330b85ebe91cfeae2 | |
parent | 14481739c434df6ff3a242d3e9cfe5e40e0e5da3 (diff) | |
download | nspr-hg-561d44c01ba232a77c7108f9aca20d17ae669486.tar.gz |
Bug 313282: we can call strlen instead of PL_strlen after checking their
arguments for null. The patch is contributed by Alfred Kayser
<alfredkayser@gmail.com>. r=wtc.
-rw-r--r-- | lib/libc/src/strcstr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libc/src/strcstr.c b/lib/libc/src/strcstr.c index 33421270..63e0dde7 100644 --- a/lib/libc/src/strcstr.c +++ b/lib/libc/src/strcstr.c @@ -45,7 +45,7 @@ PL_strcasestr(const char *big, const char *little) if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0; if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0; - ll = PL_strlen(little); + ll = strlen(little); for( ; *big; big++ ) /* obvious improvement available here */ @@ -64,8 +64,8 @@ PL_strcaserstr(const char *big, const char *little) if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0; if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0; - bl = PL_strlen(big); - ll = PL_strlen(little); + bl = strlen(big); + ll = strlen(little); if( bl < ll ) return (char *)0; p = &big[ bl - ll ]; @@ -85,7 +85,7 @@ PL_strncasestr(const char *big, const char *little, PRUint32 max) if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0; if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0; - ll = PL_strlen(little); + ll = strlen(little); if( ll > max ) return (char *)0; max -= ll; max++; @@ -107,7 +107,7 @@ PL_strncaserstr(const char *big, const char *little, PRUint32 max) if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0; if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0; - ll = PL_strlen(little); + ll = strlen(little); for( p = big; max && *p; p++, max-- ) ; |