Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-02 03:49:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 53057: Fixing up users of implicit |CharT*| conversion operators for nsCString to use |.get()| instead, rr=dbaron, rs=scc

Browse Source
This commit is contained in:
jaggernaut%netscape.com 2001-10-28 08:33:51 +00:00
parent 8f8d8dc7e1
commit e2f4401c73
6 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/inspector/base/src/inBitmapURI.cpp
View File

@ -62,12 +62,8 @@ inBitmapURI::GetBitmapName(PRUnichar** aBitmapName)
nsresult
inBitmapURI::FormatSpec(char* *result)
{
nsCString spec(NS_BITMAP_SCHEME);
spec += "//";
spec += mBitmapName;
*result = nsCRT::strdup(spec);
*result = ToNewCString(NS_LITERAL_CSTRING(NS_BITMAP_SCHEME "//") +
mBitmapName);
return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
}

2
extensions/inspector/base/src/inDOMUtils.cpp
View File

@ -173,7 +173,7 @@ inDOMUtils::GetBindingURLs(nsIDOMElement *aElement, nsISimpleEnumerator **_retva
uri += "#";
uri += id;
nsCOMPtr<nsIAtom> a = NS_NewAtom(uri);
nsCOMPtr<nsIAtom> a = NS_NewAtom(uri.get());
urls->AppendElement(a);
binding->GetBaseBinding(getter_AddRefs(tempBinding));

2
extensions/xmlterm/base/mozXMLTermStream.cpp
View File

@ -226,7 +226,7 @@ NS_IMETHODIMP mozXMLTermStream::Open(nsIDOMWindowInternal* aDOMWindow,
contractID += contentType;
nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory;
docLoaderFactory = do_CreateInstance(contractID, &result);
docLoaderFactory = do_CreateInstance(contractID.get(), &result);
if (NS_FAILED(result))
return result;

4
security/manager/ssl/src/nsNSSComponent.cpp
View File

@ -776,7 +776,7 @@ nsNSSComponent::VerifySignature(const char* aRSABuf, PRUint32 aRSABufLen,
fingerprintStr.AssignWithConversion(fingerprint);
PR_FREEIF(fingerprint);
if (NS_FAILED(rv2)) return rv2;
rv2 = mScriptSecurityManager->GetCertificatePrincipal(fingerprintStr, aPrincipal);
rv2 = mScriptSecurityManager->GetCertificatePrincipal(fingerprintStr.get(), aPrincipal);
if (NS_FAILED(rv2) || !*aPrincipal) return rv2;
nsCOMPtr<nsICertificatePrincipal> certPrincipal = do_QueryInterface(*aPrincipal, &rv2);
@ -787,7 +787,7 @@ nsNSSComponent::VerifySignature(const char* aRSABuf, PRUint32 aRSABufLen,
nsCAutoString orgNameStr;
orgNameStr.AssignWithConversion(orgName);
PR_FREEIF(orgName);
rv2 = certPrincipal->SetCommonName(orgNameStr);
rv2 = certPrincipal->SetCommonName(orgNameStr.get());
if (NS_FAILED(rv2)) return rv2;
}

6
xpinstall/src/nsRegisterItem.cpp
View File

@ -308,7 +308,7 @@ PRInt32 nsRegisterItem::Complete()
if (mChromeType & CHROME_SKIN)
{
installStr = PR_smprintf("skin,%s,url,%s\n",
location, (const char*)mURL);
location, mURL.get());
if (installStr)
{
actual = strlen(installStr);
@ -326,7 +326,7 @@ PRInt32 nsRegisterItem::Complete()
if (mChromeType & CHROME_LOCALE)
{
installStr = PR_smprintf("locale,%s,url,%s\n",
location, (const char*)mURL);
location, mURL.get());
if (installStr)
{
actual = strlen(installStr);
@ -344,7 +344,7 @@ PRInt32 nsRegisterItem::Complete()
if (mChromeType & CHROME_CONTENT)
{
installStr = PR_smprintf("content,%s,url,%s\n",
location, (const char*)mURL);
location, mURL.get());
if (installStr)
{
actual = strlen(installStr);

8
xpinstall/stub/nsStubNotifier.cpp
View File

@ -65,9 +65,7 @@ nsStubListener::ItemScheduled(const PRUnichar* message )
{
if (m_progress)
{
nsCAutoString messageCStr;
messageCStr.AssignWithConversion(message);
m_progress( messageCStr, 0, 0 );
m_progress( NS_LossyConvertUCS2toASCII(message).get(), 0, 0 );
}
return NS_OK;
}
@ -77,9 +75,7 @@ nsStubListener::FinalizeProgress(const PRUnichar* message, PRInt32 itemNum, PRIn
{
if (m_progress)
{
nsCAutoString messageCStr;
messageCStr.AssignWithConversion(message);
m_progress( messageCStr, itemNum, totNum );
m_progress( NS_LossyConvertUCS2toASCII(message).get(), itemNum, totNum );
}
return NS_OK;
}