mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Bug 104480. "EqualsIgnoreCase(nsAutoString(foo)) is bad and should
die." r=alecf, sr=jag
This commit is contained in:
parent
fa4176bcc7
commit
68c2123b34
@ -41,6 +41,7 @@
|
|||||||
#include "pratom.h"
|
#include "pratom.h"
|
||||||
#include "nsIDOMDocument.h"
|
#include "nsIDOMDocument.h"
|
||||||
#include "nsIPref.h"
|
#include "nsIPref.h"
|
||||||
|
#include "nsUnicharUtils.h"
|
||||||
|
|
||||||
#include "nsIDOMText.h"
|
#include "nsIDOMText.h"
|
||||||
#include "nsIDOMElement.h"
|
#include "nsIDOMElement.h"
|
||||||
@ -3452,7 +3453,7 @@ nsEditor::NodeIsType(nsIDOMNode *aNode, nsIAtom *aTag)
|
|||||||
element->GetTagName(tag);
|
element->GetTagName(tag);
|
||||||
const PRUnichar *unicodeString;
|
const PRUnichar *unicodeString;
|
||||||
aTag->GetUnicode(&unicodeString);
|
aTag->GetUnicode(&unicodeString);
|
||||||
if (tag.EqualsIgnoreCase(nsAutoString(unicodeString)))
|
if (tag.Equals(unicodeString, nsCaseInsensitiveStringComparator()))
|
||||||
{
|
{
|
||||||
return PR_TRUE;
|
return PR_TRUE;
|
||||||
}
|
}
|
||||||
|
@ -52,6 +52,7 @@
|
|||||||
#include "nsCRT.h"
|
#include "nsCRT.h"
|
||||||
#include "plstr.h"
|
#include "plstr.h"
|
||||||
#include "prmem.h"
|
#include "prmem.h"
|
||||||
|
#include "nsUnicharUtils.h"
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
@ -247,7 +248,9 @@ nsresult nsDateTimeFormatMac::Initialize(nsILocale* locale)
|
|||||||
else {
|
else {
|
||||||
res = locale->GetCategory(aCategory.get(), &aLocaleUnichar);
|
res = locale->GetCategory(aCategory.get(), &aLocaleUnichar);
|
||||||
if (NS_SUCCEEDED(res) && NULL != aLocaleUnichar) {
|
if (NS_SUCCEEDED(res) && NULL != aLocaleUnichar) {
|
||||||
if (mLocale.Length() && mLocale.EqualsIgnoreCase(nsAutoString(aLocaleUnichar))) {
|
if (!mLocale.IsEmpty() &&
|
||||||
|
mLocale.Equals(aLocaleUnichar,
|
||||||
|
nsCaseInsensitiveStringComparator())) {
|
||||||
nsMemory::Free(aLocaleUnichar);
|
nsMemory::Free(aLocaleUnichar);
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
@ -47,6 +47,7 @@
|
|||||||
#include "nsIPlatformCharset.h"
|
#include "nsIPlatformCharset.h"
|
||||||
#include "nsIPosixLocale.h"
|
#include "nsIPosixLocale.h"
|
||||||
#include "nsCRT.h"
|
#include "nsCRT.h"
|
||||||
|
#include "nsUnicharUtils.h"
|
||||||
|
|
||||||
NS_IMPL_THREADSAFE_ISUPPORTS1(nsDateTimeFormatUnix, nsIDateTimeFormat);
|
NS_IMPL_THREADSAFE_ISUPPORTS1(nsDateTimeFormatUnix, nsIDateTimeFormat);
|
||||||
|
|
||||||
@ -67,7 +68,9 @@ nsresult nsDateTimeFormatUnix::Initialize(nsILocale* locale)
|
|||||||
else {
|
else {
|
||||||
res = locale->GetCategory(aCategory.get(), &aLocaleUnichar);
|
res = locale->GetCategory(aCategory.get(), &aLocaleUnichar);
|
||||||
if (NS_SUCCEEDED(res) && NULL != aLocaleUnichar) {
|
if (NS_SUCCEEDED(res) && NULL != aLocaleUnichar) {
|
||||||
if (mLocale.Length() && mLocale.EqualsIgnoreCase(nsAutoString(aLocaleUnichar))) {
|
if (!mLocale.IsEmpty() &&
|
||||||
|
mLocale.Equals(aLocaleUnichar,
|
||||||
|
nsCaseInsensitiveStringComparator())) {
|
||||||
nsMemory::Free(aLocaleUnichar);
|
nsMemory::Free(aLocaleUnichar);
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
@ -355,11 +355,12 @@ NS_IMETHODIMP nsImapMailFolder::AddSubfolderWithPath(nsAutoString *name, nsIFile
|
|||||||
|
|
||||||
if(NS_SUCCEEDED(rv))
|
if(NS_SUCCEEDED(rv))
|
||||||
{
|
{
|
||||||
if(isServer && (Compare(*name,
|
if(isServer &&
|
||||||
NS_LITERAL_STRING("Inbox"),
|
name->Equals(NS_LITERAL_STRING("Inbox"),
|
||||||
nsCaseInsensitiveStringComparator()) == 0))
|
nsCaseInsensitiveStringComparator()))
|
||||||
flags |= MSG_FOLDER_FLAG_INBOX;
|
flags |= MSG_FOLDER_FLAG_INBOX;
|
||||||
else if((isServer || isParentInbox) && name->EqualsIgnoreCase(nsAutoString(kTrashName)))
|
else if((isServer || isParentInbox) && name->Equals(kTrashName,
|
||||||
|
nsCaseInsensitiveStringComparator()))
|
||||||
flags |= MSG_FOLDER_FLAG_TRASH;
|
flags |= MSG_FOLDER_FLAG_TRASH;
|
||||||
#if 0
|
#if 0
|
||||||
else if(name->EqualsIgnoreCase(kSentName))
|
else if(name->EqualsIgnoreCase(kSentName))
|
||||||
|
@ -295,15 +295,15 @@ NS_IMETHODIMP nsMsgLocalMailFolder::AddSubfolder(nsAutoString *name,
|
|||||||
//Only set these is these are top level children.
|
//Only set these is these are top level children.
|
||||||
if(NS_SUCCEEDED(rv) && isServer)
|
if(NS_SUCCEEDED(rv) && isServer)
|
||||||
{
|
{
|
||||||
if(name->EqualsIgnoreCase(nsAutoString(kInboxName)))
|
if(name->Equals(kInboxName, nsCaseInsensitiveStringComparator()))
|
||||||
{
|
{
|
||||||
flags |= MSG_FOLDER_FLAG_INBOX;
|
flags |= MSG_FOLDER_FLAG_INBOX;
|
||||||
SetBiffState(nsIMsgFolder::nsMsgBiffState_Unknown);
|
SetBiffState(nsIMsgFolder::nsMsgBiffState_Unknown);
|
||||||
}
|
}
|
||||||
else if (name->EqualsIgnoreCase(nsAutoString(kTrashName)))
|
else if (name->Equals(kTrashName, nsCaseInsensitiveStringComparator()))
|
||||||
flags |= MSG_FOLDER_FLAG_TRASH;
|
flags |= MSG_FOLDER_FLAG_TRASH;
|
||||||
else if (name->EqualsIgnoreCase(nsAutoString(kUnsentName))
|
else if (name->Equals(kUnsentName, nsCaseInsensitiveStringComparator()) ||
|
||||||
|| Compare(*name, NS_LITERAL_STRING("Outbox"), nsCaseInsensitiveStringComparator()) == 0)
|
name->Equals(NS_LITERAL_STRING("Outbox"), nsCaseInsensitiveStringComparator()))
|
||||||
flags |= MSG_FOLDER_FLAG_QUEUE;
|
flags |= MSG_FOLDER_FLAG_QUEUE;
|
||||||
#if 0
|
#if 0
|
||||||
// the logic for this has been moved into
|
// the logic for this has been moved into
|
||||||
|
Loading…
Reference in New Issue
Block a user