Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Return error codes from NS_InitXPCOM2 & NS_ShutdownXPCOM in the event of failure. b=195555 r=sfraser sr=dougt a=sspitzer

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@142320 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
locka%iol.ie 2003-05-12 12:13:21 +00:00
parent 468d4be15c
commit 1f72d24052
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/embedding/base/nsEmbedAPI.cpp
View File

@ -84,7 +84,8 @@ nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory,
#endif
{
// Initialise XPCOM
NS_InitXPCOM2(&sServiceManager, mozBinDirectory, appFileLocProvider);
rv = NS_InitXPCOM2(&sServiceManager, mozBinDirectory, appFileLocProvider);
NS_ENSURE_SUCCESS(rv, rv);
#ifdef HACK_AROUND_NONREENTRANT_INITXPCOM
sXPCOMInitializedFlag = PR_TRUE;
@ -169,7 +170,8 @@ nsresult NS_TermEmbedding()
// Terminate XPCOM & cleanup
#ifndef HACK_AROUND_NONREENTRANT_INITXPCOM
NS_ShutdownXPCOM(sServiceManager);
nsresult rv = NS_ShutdownXPCOM(sServiceManager);
NS_ENSURE_SUCCESS(rv, rv);
#endif
return NS_OK;