From f9e6fe0bf3886be7e603083b3b200dbd60fbd529 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <dimitri@stack.nl>
Date: Sat, 19 Dec 2015 23:14:24 +0100
Subject: Reverted change that caused doxygen to return error code 2 when it
 produced a warning

---
 src/doxygen.cpp |  1 -
 src/doxygen.h   |  1 -
 src/main.cpp    |  2 +-
 src/message.cpp | 11 ++++++-----
 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;
   }
 }
 
-- 
cgit v0.12