re-worded some error messages and avoid using product name

firewave · firewave · commit d2fb7766cceb · 2026-01-12T02:18:37.000+01:00
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -1506,7 +1506,7 @@ void CheckOther::commaSeparatedReturnError(const Token *tok)
                 "    if (x)\n"
                 "        return a + 1,\n"
                 "    b++;\n"
-                "However it can be useful to use comma in macros. Cppcheck does not warn when such a "
+                "However it can be useful to use comma in macros. No warning is reported when such a "
                 "macro is then used in a return statement, it is less likely such code is misunderstood.", CWE398, Certainty::normal);
 }
 
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -1252,8 +1252,8 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
 
         if (!hasValidConfig && configurations.size() > 1 && mSettings.severity.isEnabled(Severity::information)) {
             std::string msg;
-            msg = "This file is not analyzed. Cppcheck failed to extract a valid configuration. Use -v for more details.";
-            msg += "\nThis file is not analyzed. Cppcheck failed to extract a valid configuration. The tested configurations have these preprocessor errors:";
+            msg = "This file is not analyzed. No working configuration could be extracted. Use -v for more details.";
+            msg += "\nThis file is not analyzed. No working configuration could be extracted. The tested configurations have these preprocessor errors:";
             for (const std::string &s : configurationError)
                 msg += '\n' + s;
 
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -1428,7 +1428,7 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
                 else if (strcmp(childname, Settings::SafeChecks::XmlExternalVariables) == 0)
                     temp.safeChecks.externalVariables = true;
                 else {
-                    errors.emplace_back("Unknown '" + std::string(Settings::SafeChecks::XmlRootName) + "' element '" + childname + "' in Cppcheck project file");
+                    errors.emplace_back("Unknown '" + std::string(Settings::SafeChecks::XmlRootName) + "' element '" + childname + "' in Cppcheck GUI project file");
                     return false;
                 }
             }
@@ -1451,7 +1451,7 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti
         else if (strcmp(name, CppcheckXml::ProjectNameElementName) == 0)
             ; // no-op
         else {
-            errors.emplace_back("Unknown element '" + std::string(name) + "' in Cppcheck project file");
+            errors.emplace_back("Unknown element '" + std::string(name) + "' in Cppcheck GUI project file");
             return false;
         }
     }
diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
@@ -1224,7 +1224,7 @@ std::string MathLib::calculate(const std::string &first, const std::string &seco
         return MathLib::toString(MathLib::toBigNumber(first) ^ MathLib::toBigNumber(second)) + intsuffix(first, second);
 
     default:
-        throw InternalError(nullptr, std::string("Unexpected action '") + action + "' in MathLib::calculate(). Please report this to Cppcheck developers.");
+        throw InternalError(nullptr, std::string("Unexpected action '") + action + "' in MathLib::calculate(). Please report this to the developers.");
     }
 }
 
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -959,7 +959,7 @@ void Preprocessor::missingInclude(const std::string &filename, unsigned int line
     }
     ErrorMessage errmsg(std::move(locationList), mFile0, Severity::information,
                         (headerType==SystemHeader) ?
-                        "Include file: <" + header + "> not found. Please note: Cppcheck does not need standard library headers to get proper results." :
+                        "Include file: <" + header + "> not found. Please note: Standard library headers do not need to be provided to get proper results." :
                         "Include file: \"" + header + "\" not found.",
                         (headerType==SystemHeader) ? "missingIncludeSystem" : "missingInclude",
                         Certainty::normal);
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -3152,7 +3152,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
                                               "templateRecursion",
                                               "TemplateSimplifier: max template recursion ("
                                               + std::to_string(mSettings.maxTemplateRecursion)
-                                              + ") reached for template '"+typeForNewName+"'. You might want to limit Cppcheck recursion.",
+                                              + ") reached for template '"+typeForNewName+"'. You might want to adjust the template recursion limit.",
                                               Certainty::normal);
                     mErrorLogger.reportErr(errmsg);
                 }
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -424,7 +424,7 @@ int multiComparePercent(const Token *tok, const char*& haystack, nonneg int vari
                 return 1;
         } else { // %varid%
             if (varid == 0) {
-                throw InternalError(tok, "Internal error. Token::Match called with varid 0. Please report this to Cppcheck developers");
+                throw InternalError(tok, "Internal error. Token::Match called with varid 0. Please report this to the developers");
             }
 
             haystack += 6;
diff --git a/test/cli/helloworld_test.py b/test/cli/helloworld_test.py
@@ -360,7 +360,7 @@ def test_missing_include_system():  # #11283
     ]
 
     _, _, stderr = cppcheck(args, cwd=__script_dir)
-    assert stderr.replace('\\', '/') == 'helloworld/main.c:1:2: information: Include file: <stdio.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n'
+    assert stderr.replace('\\', '/') == 'helloworld/main.c:1:2: information: Include file: <stdio.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n'
 
 
 def test_sarif():
diff --git a/test/cli/other_test.py b/test/cli/other_test.py
@@ -4018,7 +4018,7 @@ def test_no_valid_configuration(tmp_path):
         '{}:1:2: error: No header in #include [syntaxError]'.format(test_file),
         '{}:1:2: error: No header in #include [syntaxError]'.format(test_file),
         '{}:1:2: error: No header in #include [syntaxError]'.format(test_file),
-        '{}:0:0: information: This file is not analyzed. Cppcheck failed to extract a valid configuration. Use -v for more details. [noValidConfiguration]'.format(test_file)
+        '{}:0:0: information: This file is not analyzed. No working configuration could be extracted. Use -v for more details. [noValidConfiguration]'.format(test_file)
     ]
 
 
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
@@ -167,7 +167,7 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS("1", MathLib::calculate("0", "1", '^'));
 
         // Unknown action should throw exception
-        ASSERT_THROW_INTERNAL_EQUALS(MathLib::calculate("1","2",'j'),INTERNAL, "Unexpected action 'j' in MathLib::calculate(). Please report this to Cppcheck developers.");
+        ASSERT_THROW_INTERNAL_EQUALS(MathLib::calculate("1","2",'j'),INTERNAL, "Unexpected action 'j' in MathLib::calculate(). Please report this to the developers.");
     }
 
     void calculate1() const {
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
@@ -2563,7 +2563,7 @@ class TestPreprocessor : public TestFixture {
         const char code[] = "#include <header.h>";
         (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
-        ASSERT_EQUALS("test.c:1:2: information: Include file: <header.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+        ASSERT_EQUALS("test.c:1:2: information: Include file: <header.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     // test for missing system include
@@ -2578,7 +2578,7 @@ class TestPreprocessor : public TestFixture {
         const char code[] = "#include <header.h>";
         (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
-        ASSERT_EQUALS("test.c:1:2: information: Include file: <header.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+        ASSERT_EQUALS("test.c:1:2: information: Include file: <header.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     // test for existing system include in system include path
@@ -2631,7 +2631,7 @@ class TestPreprocessor : public TestFixture {
         std::string code("#include <" + header + ">");
         (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
 
-        ASSERT_EQUALS("test.c:1:2: information: Include file: <" + header + "> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+        ASSERT_EQUALS("test.c:1:2: information: Include file: <" + header + "> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     // test for missing local and system include
@@ -2654,8 +2654,8 @@ class TestPreprocessor : public TestFixture {
         (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
         ASSERT_EQUALS("test.c:1:2: information: Include file: \"missing.h\" not found. [missingInclude]\n"
-                      "test.c:2:2: information: Include file: <header.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n"
-                      "test.c:3:2: information: Include file: <missing2.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+                      "test.c:2:2: information: Include file: <header.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n"
+                      "test.c:3:2: information: Include file: <missing2.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     void testMissingIncludeCheckConfig() {
@@ -2691,11 +2691,11 @@ class TestPreprocessor : public TestFixture {
         (void)getcodeforcfg(settings, *this, code.data(), code.size(), "", "test.c");
 
         ASSERT_EQUALS("test.c:1:2: information: Include file: \"missing.h\" not found. [missingInclude]\n"
-                      "test.c:2:2: information: Include file: <header.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n"
-                      "test.c:3:2: information: Include file: <missing2.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n"
+                      "test.c:2:2: information: Include file: <header.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n"
+                      "test.c:3:2: information: Include file: <missing2.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n"
                       "test.c:6:2: information: Include file: \"header4.h\" not found. [missingInclude]\n"
                       "test.c:9:2: information: Include file: \"" + missing3 + "\" not found. [missingInclude]\n"
-                      "test.c:11:2: information: Include file: <" + missing4 + "> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n", errout_str());
+                      "test.c:11:2: information: Include file: <" + missing4 + "> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n", errout_str());
     }
 
     void hasInclude() {
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
@@ -705,7 +705,7 @@ class TestToken : public TestFixture {
         ASSERT(var.tokenize("int a ; int b ;"));
 
         // Varid == 0 should throw exception
-        ASSERT_THROW_INTERNAL_EQUALS((void)Token::Match(var.tokens(), "%type% %varid% ; %type% %name%", 0),INTERNAL,"Internal error. Token::Match called with varid 0. Please report this to Cppcheck developers");
+        ASSERT_THROW_INTERNAL_EQUALS((void)Token::Match(var.tokens(), "%type% %varid% ; %type% %name%", 0),INTERNAL,"Internal error. Token::Match called with varid 0. Please report this to the developers");
 
         ASSERT_EQUALS(true, Token::Match(var.tokens(), "%type% %varid% ; %type% %name%", 1));
         ASSERT_EQUALS(true, Token::Match(var.tokens(), "%type% %name% ; %type% %varid%", 2));

Original file line number	Diff line number	Diff line change
`@@ -1506,7 +1506,7 @@ void CheckOther::commaSeparatedReturnError(const Token *tok)`
`1506`	`1506`	`" if (x)\n"`
`1507`	`1507`	`" return a + 1,\n"`
`1508`	`1508`	`" b++;\n"`
`1509`		`- "However it can be useful to use comma in macros. Cppcheck does not warn when such a "`
	`1509`	`+ "However it can be useful to use comma in macros. No warning is reported when such a "`
`1510`	`1510`	`"macro is then used in a return statement, it is less likely such code is misunderstood.", CWE398, Certainty::normal);`
`1511`	`1511`	`}`
`1512`	`1512`
Original file line number	Diff line number	Diff line change
`@@ -1428,7 +1428,7 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti`
`1428`	`1428`	`else if (strcmp(childname, Settings::SafeChecks::XmlExternalVariables) == 0)`
`1429`	`1429`	`temp.safeChecks.externalVariables = true;`
`1430`	`1430`	`else {`
`1431`		`- errors.emplace_back("Unknown '" + std::string(Settings::SafeChecks::XmlRootName) + "' element '" + childname + "' in Cppcheck project file");`
	`1431`	`+ errors.emplace_back("Unknown '" + std::string(Settings::SafeChecks::XmlRootName) + "' element '" + childname + "' in Cppcheck GUI project file");`
`1432`	`1432`	`return false;`
`1433`	`1433`	`}`
`1434`	`1434`	`}`
`@@ -1451,7 +1451,7 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings &setti`
`1451`	`1451`	`else if (strcmp(name, CppcheckXml::ProjectNameElementName) == 0)`
`1452`	`1452`	`; // no-op`
`1453`	`1453`	`else {`
`1454`		`- errors.emplace_back("Unknown element '" + std::string(name) + "' in Cppcheck project file");`
	`1454`	`+ errors.emplace_back("Unknown element '" + std::string(name) + "' in Cppcheck GUI project file");`
`1455`	`1455`	`return false;`
`1456`	`1456`	`}`
`1457`	`1457`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1224,7 +1224,7 @@ std::string MathLib::calculate(const std::string &first, const std::string &seco`
`1224`	`1224`	`return MathLib::toString(MathLib::toBigNumber(first) ^ MathLib::toBigNumber(second)) + intsuffix(first, second);`
`1225`	`1225`
`1226`	`1226`	`default:`
`1227`		`- throw InternalError(nullptr, std::string("Unexpected action '") + action + "' in MathLib::calculate(). Please report this to Cppcheck developers.");`
	`1227`	`+ throw InternalError(nullptr, std::string("Unexpected action '") + action + "' in MathLib::calculate(). Please report this to the developers.");`
`1228`	`1228`	`}`
`1229`	`1229`	`}`
`1230`	`1230`
Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,7 @@ void Preprocessor::missingInclude(const std::string &filename, unsigned int line`
`959`	`959`	`}`
`960`	`960`	`ErrorMessage errmsg(std::move(locationList), mFile0, Severity::information,`
`961`	`961`	`(headerType==SystemHeader) ?`
`962`		`- "Include file: <" + header + "> not found. Please note: Cppcheck does not need standard library headers to get proper results." :`
	`962`	`+ "Include file: <" + header + "> not found. Please note: Standard library headers do not need to be provided to get proper results." :`
`963`	`963`	`"Include file: \"" + header + "\" not found.",`
`964`	`964`	`(headerType==SystemHeader) ? "missingIncludeSystem" : "missingInclude",`
`965`	`965`	`Certainty::normal);`
Original file line number	Diff line number	Diff line change
`@@ -3152,7 +3152,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(`
`3152`	`3152`	`"templateRecursion",`
`3153`	`3153`	`"TemplateSimplifier: max template recursion ("`
`3154`	`3154`	`+ std::to_string(mSettings.maxTemplateRecursion)`
`3155`		`- + ") reached for template '"+typeForNewName+"'. You might want to limit Cppcheck recursion.",`
	`3155`	`+ + ") reached for template '"+typeForNewName+"'. You might want to adjust the template recursion limit.",`
`3156`	`3156`	`Certainty::normal);`
`3157`	`3157`	`mErrorLogger.reportErr(errmsg);`
`3158`	`3158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ int multiComparePercent(const Token tok, const char& haystack, nonneg int vari`
`424`	`424`	`return 1;`
`425`	`425`	`} else { // %varid%`
`426`	`426`	`if (varid == 0) {`
`427`		`- throw InternalError(tok, "Internal error. Token::Match called with varid 0. Please report this to Cppcheck developers");`
	`427`	`+ throw InternalError(tok, "Internal error. Token::Match called with varid 0. Please report this to the developers");`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`haystack += 6;`
Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ def test_missing_include_system(): # #11283`
`360`	`360`	`]`
`361`	`361`
`362`	`362`	`_, _, stderr = cppcheck(args, cwd=__script_dir)`
`363`		`- assert stderr.replace('\\', '/') == 'helloworld/main.c:1:2: information: Include file: <stdio.h> not found. Please note: Cppcheck does not need standard library headers to get proper results. [missingIncludeSystem]\n'`
	`363`	`+ assert stderr.replace('\\', '/') == 'helloworld/main.c:1:2: information: Include file: <stdio.h> not found. Please note: Standard library headers do not need to be provided to get proper results. [missingIncludeSystem]\n'`
`364`	`364`
`365`	`365`
`366`	`366`	`def test_sarif():`
Original file line number	Diff line number	Diff line change
`@@ -4018,7 +4018,7 @@ def test_no_valid_configuration(tmp_path):`
`4018`	`4018`	`'{}:1:2: error: No header in #include [syntaxError]'.format(test_file),`
`4019`	`4019`	`'{}:1:2: error: No header in #include [syntaxError]'.format(test_file),`
`4020`	`4020`	`'{}:1:2: error: No header in #include [syntaxError]'.format(test_file),`
`4021`		`- '{}:0:0: information: This file is not analyzed. Cppcheck failed to extract a valid configuration. Use -v for more details. [noValidConfiguration]'.format(test_file)`
	`4021`	`+ '{}:0:0: information: This file is not analyzed. No working configuration could be extracted. Use -v for more details. [noValidConfiguration]'.format(test_file)`
`4022`	`4022`	`]`
`4023`	`4023`
`4024`	`4024`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ class TestMathLib : public TestFixture {`
`167`	`167`	`ASSERT_EQUALS("1", MathLib::calculate("0", "1", '^'));`
`168`	`168`
`169`	`169`	`// Unknown action should throw exception`
`170`		`- ASSERT_THROW_INTERNAL_EQUALS(MathLib::calculate("1","2",'j'),INTERNAL, "Unexpected action 'j' in MathLib::calculate(). Please report this to Cppcheck developers.");`
	`170`	`+ ASSERT_THROW_INTERNAL_EQUALS(MathLib::calculate("1","2",'j'),INTERNAL, "Unexpected action 'j' in MathLib::calculate(). Please report this to the developers.");`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`void calculate1() const {`