From 473c2c45952d4c00728a127df61f9d17672c32d1 Mon Sep 17 00:00:00 2001 From: firewave Date: Wed, 31 Dec 2025 04:37:05 +0100 Subject: [PATCH 1/2] checkersreport.cpp: use `Settings::premium` --- lib/checkersreport.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp index c2b91c84ecb..a5135bed3f8 100644 --- a/lib/checkersreport.cpp +++ b/lib/checkersreport.cpp @@ -30,10 +30,6 @@ #include #include -static bool isCppcheckPremium(const Settings& settings) { - return (settings.cppcheckCfgProductName.compare(0, 16, "Cppcheck Premium") == 0); -} - static int getMisraCVersion(const Settings& settings) { if (settings.premiumArgs.find("misra-c-2025") != std::string::npos) return 2025; @@ -194,7 +190,7 @@ std::string CheckersReport::getReport(const std::string& criticalErrors) const fout << std::endl; } - const bool cppcheckPremium = isCppcheckPremium(mSettings); + const bool cppcheckPremium = mSettings.premium; auto reportSection = [&fout, cppcheckPremium] (const std::string& title, From 11abfc8ae690d68e941ae9a42b60f88216e220da Mon Sep 17 00:00:00 2001 From: firewave Date: Wed, 31 Dec 2025 04:46:44 +0100 Subject: [PATCH 2/2] CmdLineParser: drop parameter from `printHelp()` --- cli/cmdlineparser.cpp | 8 ++++---- cli/cmdlineparser.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp index 47759b75196..48ac7e429d9 100644 --- a/cli/cmdlineparser.cpp +++ b/cli/cmdlineparser.cpp @@ -353,7 +353,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a return Result::Fail; if (argc <= 1) { - printHelp(mSettings.premium); + printHelp(); return Result::Exit; } @@ -388,7 +388,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a // Print help if (std::strcmp(argv[i], "-h") == 0 || std::strcmp(argv[i], "--help") == 0) { - printHelp(mSettings.premium); + printHelp(); return Result::Exit; } @@ -1700,7 +1700,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a return Result::Success; } -void CmdLineParser::printHelp(bool premium) const +void CmdLineParser::printHelp() const { std::ostringstream oss; // TODO: display product name @@ -1901,7 +1901,7 @@ void CmdLineParser::printHelp(bool premium) const " --plist-output=\n" " Generate Clang-plist output files in folder.\n"; - if (premium) { + if (mSettings.premium) { oss << " --premium=