summaryrefslogtreecommitdiffstats
path: root/src/doxygen.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-12-22 15:43:21 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2019-12-22 15:43:21 (GMT)
commit0ea72fdd522e6bc3bc442e7d2ae40e7607546e55 (patch)
treef6db48d3500b0c68464be9fe92ca1eb8a193427b /src/doxygen.cpp
parent369c65635de29af6fd92c835879d70fdac7d2270 (diff)
parent146bec22e9ff91e8274becd719149f7ab9c7cfb9 (diff)
downloadDoxygen-0ea72fdd522e6bc3bc442e7d2ae40e7607546e55.zip
Doxygen-0ea72fdd522e6bc3bc442e7d2ae40e7607546e55.tar.gz
Doxygen-0ea72fdd522e6bc3bc442e7d2ae40e7607546e55.tar.bz2
Merge branch 'feature/bug_terminate' of https://github.com/albert-github/doxygen into albert-github-feature/bug_terminate
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r--src/doxygen.cpp24
1 files changed, 8 insertions, 16 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index c36c5ce..f42838f 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -8584,10 +8584,9 @@ static void computePageRelations(Entry *root)
PageDef *subPd = Doxygen::pageSDict->find(bi.name);
if (pd==subPd)
{
- err("page defined at line %d of file %s with label %s is a direct "
+ term(1,"page defined at line %d of file %s with label %s is a direct "
"subpage of itself! Please remove this cyclic dependency.\n",
pd->docLine(),pd->docFile().data(),pd->name().data());
- exit(1);
}
else if (subPd)
{
@@ -8612,10 +8611,9 @@ static void checkPageRelations()
{
if (ppd==pd)
{
- err("page defined at line %d of file %s with label %s is a subpage "
+ term(1,"page defined at line %d of file %s with label %s is a subpage "
"of itself! Please remove this cyclic dependency.\n",
pd->docLine(),pd->docFile().data(),pd->name().data());
- exit(1);
}
ppd=ppd->getOuterScope();
}
@@ -8948,8 +8946,7 @@ static void generateConfigFile(const char *configFile,bool shortList,
}
else
{
- err("Cannot open file %s for writing\n",configFile);
- exit(1);
+ term(1,"Cannot open file %s for writing\n",configFile);
}
}
static void compareDoxyfile()
@@ -8966,8 +8963,7 @@ static void compareDoxyfile()
}
else
{
- err("Cannot open file %s for writing\n",configFile);
- exit(1);
+ term(1,"Cannot open file %s for writing\n",configFile);
}
}
//----------------------------------------------------------------------------
@@ -9606,17 +9602,15 @@ void readFormulaRepository(QCString dir, bool cmp)
{
if ((f=Doxygen::formulaDict->find(formText))==0)
{
- err("discrepancy between formula repositories! Remove "
+ term(1,"discrepancy between formula repositories! Remove "
"formula.repository and from_* files from output directories.");
- exit(1);
}
QCString formLabel;
formLabel.sprintf("\\form#%d",f->getId());
if (formLabel != formName)
{
- err("discrepancy between formula repositories! Remove "
+ term(1,"discrepancy between formula repositories! Remove "
"formula.repository and from_* files from output directories.");
- exit(1);
}
new_repository++;
}
@@ -9633,9 +9627,8 @@ void readFormulaRepository(QCString dir, bool cmp)
}
if (cmp && (current_repository != new_repository))
{
- err("size discrepancy between formula repositories! Remove "
+ term(1,"size discrepancy between formula repositories! Remove "
"formula.repository and from_* files from output directories.");
- exit(1);
}
}
@@ -11475,9 +11468,8 @@ void generateOutput()
QDir searchDir(searchDirName);
if (!searchDir.exists() && !searchDir.mkdir(searchDirName))
{
- err("Could not create search results directory '%s' $PWD='%s'\n",
+ term(1,"Could not create search results directory '%s' $PWD='%s'\n",
searchDirName.data(),QDir::currentDirPath().data());
- exit(1);
}
HtmlGenerator::writeSearchData(searchDirName);
if (!serverBasedSearch) // client side search index