Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace static nsAutoStrings with nsLiteralStrings to avoid static construction, and fix a build warning while I'm here. b=61957 r=erik@netscape.com sr=waterson@netscape.com

Browse Source
This commit is contained in:
dbaron%fas.harvard.edu 2000-12-09 04:15:25 +00:00
parent 3c91a083b2
commit f196537749
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
intl/chardet/src/nsMetaCharsetObserver.cpp
View File

@ -243,8 +243,8 @@ NS_IMETHODIMP nsMetaCharsetObserver::Notify(
else if(0 == nsCRT::strcasecmp((const PRUnichar*)keys->ObjectAt(i), "content"))
contentValue=(const PRUnichar*)values->ObjectAt(i);
}
static nsAutoString contenttype = NS_ConvertToString("Content-Type");
static nsAutoString texthtml = NS_ConvertToString("text/html");
NS_NAMED_LITERAL_STRING(contenttype, "Content-Type");
NS_NAMED_LITERAL_STRING(texthtml, "text/html");
PRInt32 lastIdx =0;
if(nsnull != httpEquivValue)
@ -252,7 +252,7 @@ NS_IMETHODIMP nsMetaCharsetObserver::Notify(
if((nsnull != httpEquivValue) &&
(nsnull != contentValue) &&
((0==nsCRT::strcasecmp(httpEquivValue,contenttype.GetUnicode())) ||
((0==nsCRT::strcasecmp(httpEquivValue,contenttype.get())) ||
((((httpEquivValue[0]=='\'') &&
(httpEquivValue[lastIdx]=='\'')) ||
((httpEquivValue[0]=='\"') &&
@ -261,11 +261,11 @@ NS_IMETHODIMP nsMetaCharsetObserver::Notify(
contenttype.GetUnicode(),
contenttype.Length()))
)) &&
((0==nsCRT::strcasecmp(contentValue,texthtml.GetUnicode())) ||
((0==nsCRT::strcasecmp(contentValue,texthtml.get())) ||
(((contentValue[0]=='\'') ||
(contentValue[0]=='\"'))&&
(0==nsCRT::strncasecmp(contentValue+1,
texthtml.GetUnicode(),
texthtml.get(),
texthtml.Length()))
))
)
@ -293,8 +293,9 @@ NS_IMETHODIMP nsMetaCharsetObserver::Notify(
res = mAlias->GetPreferred(newCharset, preferred);
if(NS_SUCCEEDED(res))
{
res = NotifyWebShell(aDocumentID, NS_ConvertUCS2toUTF8(preferred.GetUnicode()),
kCharsetFromMetaTag);
res = NotifyWebShell(aDocumentID,
NS_ConvertUCS2toUTF8(preferred).get(),
kCharsetFromMetaTag);
} // if(NS_SUCCEEDED(res)
}
} // if EqualIgnoreCase