From 72245b1b1589602028ffc126d2ea77d18578672b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sun, 2 Jul 2023 18:13:11 +0200 Subject: [PATCH] xml: use version from configuration if provided (#5215) --- lib/errorlogger.cpp | 13 +++++++++++-- lib/errorlogger.h | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp index 35552d313..614802283 100644 --- a/lib/errorlogger.cpp +++ b/lib/errorlogger.cpp @@ -379,8 +379,17 @@ void ErrorMessage::deserialize(const std::string &data) } } -std::string ErrorMessage::getXMLHeader(const std::string& productName) +std::string ErrorMessage::getXMLHeader(std::string productName) { + std::string version = CppCheck::version(); + if (!productName.empty() && std::isdigit(productName.back())) { + const std::string::size_type pos = productName.find_last_not_of(".0123456789"); + if (pos > 1 && pos != std::string::npos && productName[pos] == ' ') { + version = productName.substr(pos+1); + productName.erase(pos); + } + } + tinyxml2::XMLPrinter printer; // standard xml header @@ -393,7 +402,7 @@ std::string ErrorMessage::getXMLHeader(const std::string& productName) printer.OpenElement("cppcheck", false); if (!productName.empty()) printer.PushAttribute("product-name", productName.c_str()); - printer.PushAttribute("version", CppCheck::version()); + printer.PushAttribute("version", version.c_str()); printer.CloseElement(false); printer.OpenElement("errors", false); diff --git a/lib/errorlogger.h b/lib/errorlogger.h index b47baff77..ef8d8a719 100644 --- a/lib/errorlogger.h +++ b/lib/errorlogger.h @@ -148,7 +148,7 @@ public: */ std::string toXML() const; - static std::string getXMLHeader(const std::string& productName); + static std::string getXMLHeader(std::string productName); static std::string getXMLFooter(); /**