diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-08 12:10:17 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-08 12:10:17 (GMT) |
commit | 7d4f5205482b0f0212707d573c8c668a0125cc9f (patch) | |
tree | 83fa73cff0fbcd62182aff0cce8de83064954f45 /src/doxygen.cpp | |
parent | 6d4835dbe01a27923db8a1e4559b61da5065cb7a (diff) | |
parent | 6382986b77d302be187d95aaa850eff132ec1d7d (diff) | |
download | Doxygen-7d4f5205482b0f0212707d573c8c668a0125cc9f.zip Doxygen-7d4f5205482b0f0212707d573c8c668a0125cc9f.tar.gz Doxygen-7d4f5205482b0f0212707d573c8c668a0125cc9f.tar.bz2 |
Merge branch 'memory_leakage_fix' of https://github.com/virusxp/doxygen into virusxp-memory_leakage_fix
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r-- | src/doxygen.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index fd4341c..30885f5 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -10086,13 +10086,13 @@ class NullOutlineParser : public OutlineParserInterface void initDoxygen() { initResources(); - const char *lang = portable_getenv("LC_ALL"); - if (lang) portable_setenv("LANG",lang); + const char *lang = Portables::getenv("LC_ALL"); + if (lang) Portables::setenv("LANG",lang); setlocale(LC_ALL,""); setlocale(LC_CTYPE,"C"); // to get isspace(0xA0)==0, needed for UTF-8 setlocale(LC_NUMERIC,"C"); - portable_correct_path(); + Portables::correct_path(); Doxygen::runningTime.start(); Doxygen::preprocessor = new Preprocessor(); @@ -11128,7 +11128,7 @@ void parseInput() signal(SIGINT, stopDoxygen); #endif - uint pid = portable_pid(); + uint pid = Portables::pid(); Doxygen::objDBFileName.sprintf("doxygen_objdb_%d.tmp",pid); Doxygen::objDBFileName.prepend(outputDirectory+"/"); Doxygen::entryDBFileName.sprintf("doxygen_entrydb_%d.tmp",pid); @@ -11188,18 +11188,18 @@ void parseInput() QCString curFontPath = Config_getString(DOT_FONTPATH); if (curFontPath.isEmpty()) { - portable_getenv("DOTFONTPATH"); + Portables::getenv("DOTFONTPATH"); QCString newFontPath = "."; if (!curFontPath.isEmpty()) { - newFontPath+=portable_pathListSeparator(); + newFontPath+=Portables::pathListSeparator(); newFontPath+=curFontPath; } - portable_setenv("DOTFONTPATH",newFontPath); + Portables::setenv("DOTFONTPATH",newFontPath); } else { - portable_setenv("DOTFONTPATH",curFontPath); + Portables::setenv("DOTFONTPATH",curFontPath); } } @@ -11824,7 +11824,7 @@ void generateOutput() { searchDataFile="searchdata.xml"; } - if (!portable_isAbsolutePath(searchDataFile)) + if (!Portables::isAbsolutePath(searchDataFile)) { searchDataFile.prepend(Config_getString(OUTPUT_DIRECTORY)+"/"); } @@ -11886,13 +11886,13 @@ void generateOutput() g_s.begin("Running html help compiler...\n"); QString oldDir = QDir::currentDirPath(); QDir::setCurrent(Config_getString(HTML_OUTPUT)); - portable_setShortDir(); - portable_sysTimerStart(); - if (portable_system(Config_getString(HHC_LOCATION), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))!=1) + Portables::setShortDir(); + Portables::sysTimerStart(); + if (Portables::system(Config_getString(HHC_LOCATION), "index.hhp", Debug::isFlagSet(Debug::ExtCmd))!=1) { err("failed to run html help compiler on index.hhp\n"); } - portable_sysTimerStop(); + Portables::sysTimerStop(); QDir::setCurrent(oldDir); g_s.end(); } @@ -11907,12 +11907,12 @@ void generateOutput() QCString const args = QCString().sprintf("%s -o \"%s\"", qhpFileName.data(), qchFileName.data()); QString const oldDir = QDir::currentDirPath(); QDir::setCurrent(Config_getString(HTML_OUTPUT)); - portable_sysTimerStart(); - if (portable_system(Config_getString(QHG_LOCATION), args.data(), FALSE)) + Portables::sysTimerStart(); + if (Portables::system(Config_getString(QHG_LOCATION), args.data(), FALSE)) { err("failed to run qhelpgenerator on index.qhp\n"); } - portable_sysTimerStop(); + Portables::sysTimerStop(); QDir::setCurrent(oldDir); g_s.end(); } @@ -11933,7 +11933,7 @@ void generateOutput() { msg("Total elapsed time: %.3f seconds\n(of which %.3f seconds waiting for external tools to finish)\n", ((double)Doxygen::runningTime.elapsed())/1000.0, - portable_getSysElapsedTime() + Portables::getSysElapsedTime() ); g_s.print(); } |