Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xml: use version from configuration if provided #5215

Merged
merged 1 commit into from
Jul 2, 2023
+13 −4
Merged

xml: use version from configuration if provided #5215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions lib/errorlogger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion lib/errorlogger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ class CPPCHECKLIB ErrorMessage {
*/
std::string toXML() const;

static std::string getXMLHeader(const std::string& productName);
static std::string getXMLHeader(std::string productName);
static std::string getXMLFooter();

/**
Expand Down