diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp index ac6313611..1cc7188a6 100644 --- a/cli/cmdlineparser.cpp +++ b/cli/cmdlineparser.cpp @@ -660,9 +660,6 @@ void CmdLineParser::PrintHelp() " * missingInclude\n" " Warn if there are missing includes.\n" " For detailed information use --check-config\n" - " * posix\n" - " Enable checks specific for POSIX-compiliant\n" - " code.\n" " Several ids can be given if you separate them with\n" " commas.\n" " --error-exitcode= If errors are found, integer [n] is returned instead\n" diff --git a/lib/checknonreentrantfunctions.cpp b/lib/checknonreentrantfunctions.cpp index 77f65d6a4..67d729ef9 100644 --- a/lib/checknonreentrantfunctions.cpp +++ b/lib/checknonreentrantfunctions.cpp @@ -33,7 +33,7 @@ CheckNonReentrantFunctions instance; void CheckNonReentrantFunctions::nonReentrantFunctions() { - if (!_settings->isEnabled("posix") || !_settings->isEnabled("style")) + if (!_settings->posix || !_settings->isEnabled("style")) return; // Don't check C# and Java code diff --git a/lib/checkobsoletefunctions.cpp b/lib/checkobsoletefunctions.cpp index 0059cc4f0..0aae98111 100644 --- a/lib/checkobsoletefunctions.cpp +++ b/lib/checkobsoletefunctions.cpp @@ -40,8 +40,6 @@ void CheckObsoleteFunctions::obsoleteFunctions() if (_tokenizer->isJavaOrCSharp()) return; - const bool checkPosix = _settings->isEnabled("posix"); - for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) { if (tok->isName() && tok->varId()==0 && tok->strAt(1) == "(" && !Token::Match(tok->previous(), ".|::|:|,")) @@ -58,7 +56,7 @@ void CheckObsoleteFunctions::obsoleteFunctions() reportError(tok->tokAt(1), Severity::information, "obsoleteFunctions"+it->first, it->second); break; } - else if (checkPosix) + else if (_settings->posix) { it = _obsoletePosixFunctions.find(tok->str()); if (it != _obsoletePosixFunctions.end()) diff --git a/lib/settings.cpp b/lib/settings.cpp index 59bb7065b..43c630c07 100644 --- a/lib/settings.cpp +++ b/lib/settings.cpp @@ -48,6 +48,7 @@ Settings::Settings() reportProgress = false; ifcfg = false; checkConfiguration = false; + posix = false; } std::string Settings::Suppressions::parseFile(std::istream &istr) @@ -393,7 +394,6 @@ std::string Settings::addEnabled(const std::string &str) id.insert("missingInclude"); id.insert("unusedFunction"); id.insert("information"); - id.insert("posix"); if (str == "all") { diff --git a/lib/settings.h b/lib/settings.h index e1a51d209..80752171f 100644 --- a/lib/settings.h +++ b/lib/settings.h @@ -300,6 +300,9 @@ public: /** Is the 'configuration checking' wanted? */ bool checkConfiguration; + + /** Posix checks */ + bool posix; }; /// @} diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp index 678f7cfa4..341a3e8b6 100644 --- a/test/testcmdlineparser.cpp +++ b/test/testcmdlineparser.cpp @@ -62,7 +62,6 @@ private: TEST_CASE(enabledStyle); TEST_CASE(enabledUnusedFunction); TEST_CASE(enabledMissingInclude); - TEST_CASE(enablePosix); TEST_CASE(errorExitcode); TEST_CASE(errorExitcodeMissing); TEST_CASE(errorExitcodeStr); @@ -425,16 +424,6 @@ private: ASSERT(settings.isEnabled("missingInclude")); } - void enablePosix() - { - REDIRECT; - const char *argv[] = {"cppcheck", "--enable=posix", "file.cpp"}; - Settings settings; - CmdLineParser parser(&settings); - ASSERT(parser.ParseFromArgs(3, argv)); - ASSERT(settings.isEnabled("posix")); - } - void errorExitcode() { REDIRECT; diff --git a/test/testnonreentrantfunctions.cpp b/test/testnonreentrantfunctions.cpp index c86b5e33f..c155e7a59 100644 --- a/test/testnonreentrantfunctions.cpp +++ b/test/testnonreentrantfunctions.cpp @@ -38,15 +38,13 @@ private: TEST_CASE(test_crypt); } - void check(const char code[]) { // Clear the error buffer.. errout.str(""); Settings settings; - settings.addEnabled("posix"); - settings.inconclusive = true; + settings.posix = true; settings.addEnabled("style"); // Tokenize.. diff --git a/test/testobsoletefunctions.cpp b/test/testobsoletefunctions.cpp index abaa53816..6402870ab 100644 --- a/test/testobsoletefunctions.cpp +++ b/test/testobsoletefunctions.cpp @@ -50,7 +50,6 @@ private: TEST_CASE(testgets); } - void check(const char code[]) { // Clear the error buffer.. @@ -58,7 +57,7 @@ private: Settings settings; settings.addEnabled("style"); - settings.addEnabled("posix"); + settings.posix = true; // Tokenize.. Tokenizer tokenizer(&settings, this);