зеркало из https://github.com/mozilla/gecko-dev.git
Return error codes from NS_InitXPCOM2 & NS_ShutdownXPCOM in the event of failure. b=195555 r=sfraser sr=dougt a=sspitzer
This commit is contained in:
Родитель
8dc3ad3076
Коммит
80d866eaab
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче