From 9876f2a693f02fd624af78d0d714b2bc5efecab5 Mon Sep 17 00:00:00 2001 From: "bzbarsky%mit.edu" Date: Wed, 12 Sep 2007 17:49:39 +0000 Subject: [PATCH] Relanding the Compare --> Equals conversion. a=mcafee git-svn-id: svn://10.0.0.236/trunk@235774 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/suite/browser/src/nsBookmarksService.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/mozilla/suite/browser/src/nsBookmarksService.cpp b/mozilla/suite/browser/src/nsBookmarksService.cpp index 5799f6f5938..ce3c067a751 100644 --- a/mozilla/suite/browser/src/nsBookmarksService.cpp +++ b/mozilla/suite/browser/src/nsBookmarksService.cpp @@ -934,27 +934,22 @@ BookmarkParser::Unescape(nsString &text) while((offset = text.FindChar((PRUnichar('&')), offset)) >= 0) { - // XXX get max of 6 chars; change the value below if - // we ever start looking for longer HTML-escaped values - nsAutoString temp; - text.Mid(temp, offset, 6); - - if (Compare(Substring(temp, 0, 4), NS_LITERAL_STRING("<"), nsCaseInsensitiveStringComparator()) == 0) + if (Substring(text, offset, 4).Equals(NS_LITERAL_STRING("<"), nsCaseInsensitiveStringComparator())) { text.Cut(offset, 4); text.Insert(PRUnichar('<'), offset); } - if (Compare(Substring(temp, 0, 4), NS_LITERAL_STRING(">"), nsCaseInsensitiveStringComparator()) == 0) + else if (Substring(text, offset, 4).Equals(NS_LITERAL_STRING(">"), nsCaseInsensitiveStringComparator())) { text.Cut(offset, 4); text.Insert(PRUnichar('>'), offset); } - if (Compare(Substring(temp, 0, 5), NS_LITERAL_STRING("&"), nsCaseInsensitiveStringComparator()) == 0) + else if (Substring(text, offset, 5).Equals(NS_LITERAL_STRING("&"), nsCaseInsensitiveStringComparator())) { text.Cut(offset, 5); text.Insert(PRUnichar('&'), offset); } - if (Compare(Substring(temp, 0, 6), NS_LITERAL_STRING("""), nsCaseInsensitiveStringComparator()) == 0) + else if (Substring(text, offset, 6).Equals(NS_LITERAL_STRING("""), nsCaseInsensitiveStringComparator())) { text.Cut(offset, 6); text.Insert(PRUnichar('\"'), offset);