Permalink
Browse files

Reverted change that caused doxygen to return error code 2 when it pr…

…oduced a warning
  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed Dec 19, 2015
1 parent ae6311e commit f9e6fe0bf3886be7e603083b3b200dbd60fbd529
Showing with 7 additions and 8 deletions.
  1. +0 −1 src/doxygen.cpp
  2. +0 −1 src/doxygen.h
  3. +1 −1 src/main.cpp
  4. +6 −5 src/message.cpp
@@ -170,7 +170,6 @@ QCString Doxygen::spaces;
bool Doxygen::generatingXmlOutput = FALSE;
bool Doxygen::markdownSupport = TRUE;
GenericsSDict *Doxygen::genericsDict;
int Doxygen::exitCode = 0;
// locally accessible globals
static QDict<EntryNav> g_classEntries(1009);
@@ -152,7 +152,6 @@ class Doxygen
static bool generatingXmlOutput;
static bool markdownSupport;
static GenericsSDict *genericsDict;
static int exitCode;
};
void initDoxygen();
@@ -36,6 +36,6 @@ int main(int argc,char **argv)
adjustConfiguration();
parseInput();
generateOutput();
return Doxygen::exitCode;
return 0;
}
@@ -97,7 +97,8 @@ void initWarningFormat()
warnFile = stderr;
}
if (Config_getBool("WARN_AS_ERROR")) {
if (Config_getBool("WARN_AS_ERROR"))
{
warning_str = error_str;
}
}
@@ -149,17 +150,17 @@ static void format_warn(const char *file,int line,const char *text)
),
"$text",textSubst
);
if (warnAsError) {
if (warnAsError)
{
msgText += " (warning treated as error, aborting now)";
}
msgText += '\n';
// print resulting message
fwrite(msgText.data(),1,msgText.length(),warnFile);
if (warnAsError) {
if (warnAsError)
{
exit(1);
} else {
Doxygen::exitCode = 2;
}
}

0 comments on commit f9e6fe0

Please sign in to comment.