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

Using nsObjectHashtable::RemoveAndDelete()

Browse Source
This commit is contained in:
dp%netscape.com 1999-08-03 00:03:38 +00:00
parent 10e319cdca
commit 04fdcf4983
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xpcom/components/nsComponentManager.cpp
View File

@ -1413,8 +1413,8 @@ nsComponentManagerImpl::RegisterFactory(const nsCID &aClass,
if (entry)
{
PR_LOG(nsComponentManagerLog, PR_LOG_WARNING, ("\t\tdeleting old Factory Entry."));
mFactories->Remove(&key);
delete entry;
mFactories->RemoveAndDelete(&key);
entry = NULL;
}
mFactories->Put(&key, newEntry);
@ -1529,8 +1529,7 @@ nsComponentManagerImpl::RegisterComponentSpec(const nsCID &aClass,
}
if (entry)
{
mFactories->Remove(&key);
delete entry;
mFactories->RemoveAndDelete(&key);
entry = NULL;
PR_LOG(nsComponentManagerLog, PR_LOG_WARNING, ("\t\tdeleting registered Factory."));
}
@ -1613,8 +1612,7 @@ nsComponentManagerImpl::RegisterComponentLib(const nsCID &aClass,
}
if (entry)
{
mFactories->Remove(&key);
delete entry;
mFactories->RemoveAndDelete(&key);
entry = NULL;
PR_LOG(nsComponentManagerLog, PR_LOG_WARNING, ("\t\tdeleting registered Factory."));
}
@ -1656,9 +1654,9 @@ nsComponentManagerImpl::UnregisterFactory(const nsCID &aClass,
if (old->factory == aFactory)
{
PR_EnterMonitor(mMon);
old = (nsFactoryEntry *) mFactories->Remove(&key);
old = (nsFactoryEntry *) mFactories->RemoveAndDelete(&key);
old = NULL;
PR_ExitMonitor(mMon);
delete old;
res = NS_OK;
}
@ -1700,8 +1698,8 @@ nsComponentManagerImpl::UnregisterComponent(const nsCID &aClass,
#endif
)
{
nsFactoryEntry *entry = (nsFactoryEntry *) mFactories->Remove(&key);
delete entry;
mFactories->RemoveAndDelete(&key);
old = NULL;
res = NS_OK;
}
#ifdef USE_REGISTRY