From 9a383388beeefaf66d9b809eb7a1b7df421cc3ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Wed, 2 Feb 2011 18:46:07 +0100
Subject: [PATCH] xml2: added <errors> element

---
 cli/cppcheckexecutor.cpp | 4 ++--
 lib/errorlogger.cpp      | 7 ++++---
 lib/errorlogger.h        | 2 +-
 test/testerrorlogger.cpp | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
index fdb886471..1f008f890 100644
--- a/cli/cppcheckexecutor.cpp
+++ b/cli/cppcheckexecutor.cpp
@@ -55,7 +55,7 @@ bool CppCheckExecutor::parseFromArgs(CppCheck *cppcheck, int argc, const char* c
             errorlist = true;
             std::cout << ErrorLogger::ErrorMessage::getXMLHeader(_settings._xml_version);
             cppcheck->getErrorMessages();
-            std::cout << ErrorLogger::ErrorMessage::getXMLFooter() << std::endl;
+            std::cout << ErrorLogger::ErrorMessage::getXMLFooter(_settings._xml_version) << std::endl;
         }
 
         if (parser.ExitAfterPrinting())
@@ -141,7 +141,7 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
 
     if (_settings._xml)
     {
-        reportErr(ErrorLogger::ErrorMessage::getXMLFooter());
+        reportErr(ErrorLogger::ErrorMessage::getXMLFooter(_settings._xml_version));
     }
 
     if (returnValue)
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
index 6f4baa90f..0bb9cbc98 100644
--- a/lib/errorlogger.cpp
+++ b/lib/errorlogger.cpp
@@ -162,15 +162,16 @@ std::string ErrorLogger::ErrorMessage::getXMLHeader(int xml_version)
     else
     {
         ostr << "<results version=\"" << xml_version << "\">\n";
-        ostr << "  <cppcheck version=\"" << CppCheck::version() << "\"/>";
+        ostr << "  <cppcheck version=\"" << CppCheck::version() << "\"/>\n";
+        ostr << "  <errors>";
     }
 
     return ostr.str();
 }
 
-std::string ErrorLogger::ErrorMessage::getXMLFooter()
+std::string ErrorLogger::ErrorMessage::getXMLFooter(int xml_version)
 {
-    return "</results>";
+    return (xml_version<=1) ? "</results>" : "  </errors>\n</results>";
 }
 
 static std::string stringToXml(std::string s)
diff --git a/lib/errorlogger.h b/lib/errorlogger.h
index da68ba499..da5b7835f 100644
--- a/lib/errorlogger.h
+++ b/lib/errorlogger.h
@@ -137,7 +137,7 @@ public:
         std::string toXML(bool verbose, int ver) const;
 
         static std::string getXMLHeader(int xml_version);
-        static std::string getXMLFooter();
+        static std::string getXMLFooter(int xml_version);
 
         /**
          * Format the error message into a string.
diff --git a/test/testerrorlogger.cpp b/test/testerrorlogger.cpp
index e1064464b..fd10cba36 100644
--- a/test/testerrorlogger.cpp
+++ b/test/testerrorlogger.cpp
@@ -124,7 +124,7 @@ private:
         locs.push_back(loc);
         ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId");
         ASSERT_EQUALS("<?xml version=\"1.0\"?>\n<results>", ErrorLogger::ErrorMessage::getXMLHeader(1));
-        ASSERT_EQUALS("</results>", ErrorLogger::ErrorMessage::getXMLFooter());
+        ASSERT_EQUALS("</results>", ErrorLogger::ErrorMessage::getXMLFooter(1));
         ASSERT_EQUALS("<error file=\"foo.cpp\" line=\"5\" id=\"errorId\" severity=\"error\" msg=\"Programming error.\"/>", msg.toXML(false,1));
     }
 
@@ -137,7 +137,7 @@ private:
         locs.push_back(loc);
         ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId");
         ASSERT_EQUALS("<?xml version=\"1.0\"?>\n<results>", ErrorLogger::ErrorMessage::getXMLHeader(1));
-        ASSERT_EQUALS("</results>", ErrorLogger::ErrorMessage::getXMLFooter());
+        ASSERT_EQUALS("</results>", ErrorLogger::ErrorMessage::getXMLFooter(1));
         ASSERT_EQUALS("<error file=\"foo.cpp\" line=\"5\" id=\"errorId\" severity=\"error\" msg=\"Verbose error\"/>", msg.toXML(true,1));
     }
 };