corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 345517, try #2, make the browser component use frozen linkage, so that ff+xr builds. This does *not* --enable-libxul by default for Firefox (yet). That will wait until after 1.9a1. Older patch r=darin+mento, revisions r=mano

Browse Source
This commit is contained in:
benjamin@smedbergs.us
2006-11-09 15:02:29 +00:00
parent 5c537d0521
commit 84c6af09b6
51 changed files with 565 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
xpcom/glue/nsStringAPI.cpp
View File

@@ -342,7 +342,7 @@ static PRBool ns_strnimatch(const PRUnichar *aStr, const char* aSubstring,
if (!NS_IsAscii(*aStr))
return PR_FALSE;
if (NS_ToLower((char) *aStr) != *aSubstring)
if (NS_ToLower((char) *aStr) != NS_ToLower(*aSubstring))
return PR_FALSE;
}
@@ -350,7 +350,7 @@ static PRBool ns_strnimatch(const PRUnichar *aStr, const char* aSubstring,
}
PRInt32
nsAString::Find(const char *aStr, PRBool aIgnoreCase) const
nsAString::Find(const char *aStr, PRUint32 aOffset, PRBool aIgnoreCase) const
{
PRBool (*match)(const PRUnichar*, const char*, PRUint32) =
aIgnoreCase ? ns_strnimatch : ns_strnmatch;
@@ -358,6 +358,9 @@ nsAString::Find(const char *aStr, PRBool aIgnoreCase) const
const char_type *begin, *end;
PRUint32 selflen = BeginReading(&begin, &end);
if (aOffset > selflen)
return -1;
PRUint32 otherlen = strlen(aStr);
if (otherlen > selflen)
@@ -366,7 +369,7 @@ nsAString::Find(const char *aStr, PRBool aIgnoreCase) const
// We want to stop searching otherlen characters before the end of the string
end -= otherlen;
for (const char_type *cur = begin; cur <= end; ++cur) {
for (const char_type *cur = begin + aOffset; cur <= end; ++cur) {
if (match(cur, aStr, otherlen)) {
return cur - begin;
}
@@ -682,7 +685,7 @@ nsACString::Find(const char_type *aStr, PRUint32 aLen, ComparatorFunc c) const
end -= aLen;
for (const char_type *cur = begin; cur <= end; ++cur) {
if (!c(begin, aStr, aLen))
if (!c(cur, aStr, aLen))
return cur - begin;
}
return -1;