From bug 278534 - Can't have NS_NAMED_LITERAL_CSTRING at static/global scope, because the XPCOM library can be unloaded before the module cleanup fires. Should clear up cadence orange.

git-svn-id: svn://10.0.0.236/trunk@169624 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bsmedberg%covad.net 2005-02-23 00:01:54 +00:00
parent 2403194810
commit f35bcd4e09

View File

@ -522,11 +522,12 @@ nsChromeRegistry::GetProviderAndPath(nsIURL* aChromeURL,
return NS_OK;
}
static NS_NAMED_LITERAL_CSTRING(kSlash, "/");
nsresult
nsChromeRegistry::Canonify(nsIURL* aChromeURL)
{
NS_NAMED_LITERAL_CSTRING(kSlash, "/");
nsresult rv;
nsCAutoString provider, path;
@ -1482,13 +1483,15 @@ GetResourceName(nsIRDFResource* res, nsACString& result)
result.Assign(Substring(providerURI, found + 1));
}
static NS_NAMED_LITERAL_CSTRING(kTab, "\t");
void
nsChromeRegistry::ProcessProvider(PRFileDesc *fd, nsIRDFService* aRDFs,
nsIRDFDataSource* aDS, nsIRDFResource* aRoot,
PRBool aIsLocale, const nsACString& aBaseURL)
{
NS_NAMED_LITERAL_CSTRING(kSlash, "/");
NS_NAMED_LITERAL_CSTRING(kTab, "\t");
nsresult rv;
nsCOMPtr<nsIRDFResource> packagesarc;
@ -1582,13 +1585,14 @@ GetLiteralText(nsIRDFLiteral* lit, nsACString& result)
CopyUTF16toUTF8(value, result);
}
static NS_NAMED_LITERAL_CSTRING(kLinebreak, NS_LINEBREAK);
void
nsChromeRegistry::ProcessOverlays(PRFileDesc *fd, nsIRDFDataSource* aDS,
nsIRDFResource* aRoot,
const nsCSubstring& aType)
{
NS_NAMED_LITERAL_CSTRING(kTab, "\t");
NS_NAMED_LITERAL_CSTRING(kLinebreak, NS_LINEBREAK);
nsresult rv;
nsCOMPtr<nsISimpleEnumerator> overlaids;