From e0ec056ab2985eba92fbf0c1d918cb926f487e40 Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Sat, 6 Nov 2004 17:28:22 +0000 Subject: [PATCH] bug 267079 don't use EqualsIgnoreCase for a string not containing characters; and replace the deprecated .Mid with StringTail. r=bzbarsky sr=darin git-svn-id: svn://10.0.0.236/trunk@165064 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsDefaultURIFixup.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mozilla/docshell/base/nsDefaultURIFixup.cpp b/mozilla/docshell/base/nsDefaultURIFixup.cpp index 3c4209cb31a..b8ca485493e 100644 --- a/mozilla/docshell/base/nsDefaultURIFixup.cpp +++ b/mozilla/docshell/base/nsDefaultURIFixup.cpp @@ -281,17 +281,13 @@ nsDefaultURIFixup::CreateFixupURI(const nsACString& aStringURI, PRUint32 aFixupF // ://totallybroken.url.com // //shorthand.url.com // - if (uriString.EqualsIgnoreCase("://", 3)) + if (StringBeginsWith(uriString, NS_LITERAL_CSTRING("://"))) { - nsCAutoString newUriString; - uriString.Mid(newUriString, 3, uriString.Length() - 3); - uriString = newUriString; + uriString = StringTail(uriString, uriString.Length() - 3); } - else if (uriString.EqualsIgnoreCase("//", 2)) + else if (StringBeginsWith(uriString, NS_LITERAL_CSTRING("//"))) { - nsCAutoString newUriString; - uriString.Mid(newUriString, 2, uriString.Length() - 2); - uriString = newUriString; + uriString = StringTail(uriString, uriString.Length() - 2); } // Add ftp:// or http:// to front of url if it has no spec