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

Bug 325229 part 2 - Stub out the old exitroutine functions which are fatally flawed, r=darin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@189823 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
benjamin%smedbergs.us
2006-02-13 16:08:55 +00:00
parent 8a0f334ba0
commit 88a2db7cdf
4 changed files with 21 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
mozilla/xpcom/build/nsXPComInit.cpp
View File

@@ -627,51 +627,6 @@ NS_InitXPCOM3(nsIServiceManager* *result,
}
static nsVoidArray* gExitRoutines;
static void CallExitRoutines()
{
if (!gExitRoutines)
return;
PRInt32 count = gExitRoutines->Count();
for (PRInt32 i = 0; i < count; i++) {
XPCOMExitRoutine func = (XPCOMExitRoutine) gExitRoutines->ElementAt(i);
func();
}
gExitRoutines->Clear();
delete gExitRoutines;
gExitRoutines = nsnull;
}
EXPORT_XPCOM_API(nsresult)
NS_RegisterXPCOMExitRoutine(XPCOMExitRoutine exitRoutine, PRUint32 priority)
{
// priority are not used right now. It will need to be implemented as more
// classes are moved into the glue library --dougt
if (!gExitRoutines) {
gExitRoutines = new nsVoidArray();
if (!gExitRoutines) {
NS_WARNING("Failed to allocate gExitRoutines");
return NS_ERROR_FAILURE;
}
}
PRBool okay = gExitRoutines->AppendElement((void*)exitRoutine);
return okay ? NS_OK : NS_ERROR_FAILURE;
}
EXPORT_XPCOM_API(nsresult)
NS_UnregisterXPCOMExitRoutine(XPCOMExitRoutine exitRoutine)
{
if (!gExitRoutines)
return NS_ERROR_FAILURE;
PRBool okay = gExitRoutines->RemoveElement((void*)exitRoutine);
return okay ? NS_OK : NS_ERROR_FAILURE;
}
//
// NS_ShutdownXPCOM()
//
@@ -806,8 +761,6 @@ NS_ShutdownXPCOM(nsIServiceManager* servMgr)
// shutting down the component manager
nsTimerImpl::Shutdown();
CallExitRoutines();
// Shutdown xpcom. This will release all loaders and cause others holding
// a refcount to the component manager to release it.
if (nsComponentManagerImpl::gComponentManager) {