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

Bug 362318 (patch from bug 326837) invalid warnings on startup about static objects, r=sspitzer

Browse Source
This commit is contained in:
benjamin%smedbergs.us 2007-02-20 19:42:12 +00:00
parent 048b1a5212
commit b84ccbd74b
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
toolkit/xre/nsAppRunner.cpp
View File

@ -949,11 +949,21 @@ ScopedXPCOMStartup::SetWindowCreator(nsINativeAppSupport* native)
return wwatch->SetWindowCreator(creator);
}
/**
* A helper class which calls NS_LogTerm/NS_LogTerm in it's scope.
*/
class ScopedLogging
{
public:
ScopedLogging() { NS_LogInit(); }
~ScopedLogging() { NS_LogTerm(); }
};
static void DumpArbitraryHelp()
{
nsresult rv;
NS_LogInit();
ScopedLogging log;
{
nsXREDirProvider dirProvider;
@ -973,8 +983,6 @@ static void DumpArbitraryHelp()
if (NS_SUCCEEDED(rv))
printf("%s", text.get());
}
NS_LogTerm();
}
// English text needs to go into a dtd file.
@ -2303,6 +2311,8 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
}
}
ScopedLogging log;
if (!appData.xreDirectory) {
nsCOMPtr<nsILocalFile> lf;
rv = XRE_GetBinaryPath(gArgv[0], getter_AddRefs(lf));
@ -2390,8 +2400,6 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
gArgc = argc = NS_TraceMallocStartupArgs(gArgc, gArgv);
#endif
NS_LogInit();
{
nsXREDirProvider dirProvider;
rv = dirProvider.Initialize(gAppData->directory, gAppData->xreDirectory);
@ -2928,7 +2936,5 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
}
}
NS_LogTerm();
return NS_FAILED(rv) ? 1 : 0;
}