part of mailnews audit --> Conversion to NS_WITH_SERVICE

This commit is contained in:
mscott%netscape.com 1999-05-04 21:05:30 +00:00
parent 8dcc69b20e
commit 22be4352a5
2 changed files with 3 additions and 11 deletions

View File

@ -155,9 +155,7 @@ nsImapMailDatabase::CreateMsgHdr(nsIMdbRow* hdrRow, nsMsgKey key, nsIMsgHdr* *re
nsresult rv;
nsIRDFService *rdf;
rv = nsServiceManager::GetService(kRDFServiceCID,
nsIRDFService::GetIID(),
(nsISupports**)&rdf);
NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
@ -192,8 +190,6 @@ nsImapMailDatabase::CreateMsgHdr(nsIMdbRow* hdrRow, nsMsgKey key, nsIMsgHdr* *re
}
*result = msgHdr;
//nsServiceManager::ReleaseService(kRDFServiceCID, rdf);
return NS_OK;
}
*/

View File

@ -2530,16 +2530,12 @@ PRBool nsMsgDatabase::ThreadBySubjectWithoutRe()
nsresult nsMsgDatabase::GetBoolPref(const char *prefName, PRBool *result)
{
PRBool prefValue = PR_FALSE;
nsIPref* prefs = nsnull;
nsresult rv;
rv = nsServiceManager::GetService(kPrefCID, kIPrefIID, (nsISupports**)&prefs);
if (prefs && NS_SUCCEEDED(rv))
NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv);
if (NS_SUCCEEDED(rv) && prefs)
{
// prefs->Startup("prefs50.js");
rv = prefs->GetBoolPref(prefName, &prefValue);
*result = prefValue;
nsServiceManager::ReleaseService(kPrefCID, prefs);
}
return rv;
}