summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2015-12-19 22:14:24 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2015-12-19 22:14:24 (GMT)
commitf9e6fe0bf3886be7e603083b3b200dbd60fbd529 (patch)
treec4d43b61af59026e882bfb5b9e4ddc9eac7d82bc
parentae6311ea0855d576a7c4b589dd5f4b994a47fd6c (diff)
downloadDoxygen-f9e6fe0bf3886be7e603083b3b200dbd60fbd529.zip
Doxygen-f9e6fe0bf3886be7e603083b3b200dbd60fbd529.tar.gz
Doxygen-f9e6fe0bf3886be7e603083b3b200dbd60fbd529.tar.bz2
Reverted change that caused doxygen to return error code 2 when it produced a warning
-rw-r--r--src/doxygen.cpp1
-rw-r--r--src/doxygen.h1
-rw-r--r--src/main.cpp2
-rw-r--r--src/message.cpp11
4 files changed, 7 insertions, 8 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 8fbcd17..a3a3d2a 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.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);
diff --git a/src/doxygen.h b/src/doxygen.h
index 67acd9e..2195a35 100644
--- a/src/doxygen.h
+++ b/src/doxygen.h
@@ -152,7 +152,6 @@ class Doxygen
static bool generatingXmlOutput;
static bool markdownSupport;
static GenericsSDict *genericsDict;
- static int exitCode;
};
void initDoxygen();
diff --git a/src/main.cpp b/src/main.cpp
index 2f2fca5..2061087 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,6 +36,6 @@ int main(int argc,char **argv)
adjustConfiguration();
parseInput();
generateOutput();
- return Doxygen::exitCode;
+ return 0;
}
diff --git a/src/message.cpp b/src/message.cpp
index d94661c..c61de68 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -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;
}
}