Settings: added generic hasLib() and removed posix()

Author: firewave

lib/checkclass.cpp

@@ -102,13 +102,6 @@ static bool isVariableCopyNeeded(const Variable &var, Function::Type type)
             (var.valueType() && var.valueType()->type >= ValueType::Type::CHAR));
 }
 
-static bool isVcl(const Settings *settings)
-{
-    return std::any_of(settings->libraries.cbegin(), settings->libraries.cend(), [](const std::string& library) {
-        return library == "vcl";
-    });
-}
-
 static bool isVclTypeInit(const Type *type)
 {
     if (!type)
@@ -141,7 +134,7 @@ void CheckClass::constructors()
 
     const bool printInconclusive = mSettings->certainty.isEnabled(Certainty::inconclusive);
     for (const Scope * scope : mSymbolDatabase->classAndStructScopes) {
-        if (isVcl(mSettings) && isVclTypeInit(scope->definedType))
+        if (mSettings->hasLib("vcl") && isVclTypeInit(scope->definedType))
             continue;
 
         const bool unusedTemplate = Token::simpleMatch(scope->classDef->previous(), ">");

lib/checkmemoryleak.cpp

@@ -116,7 +116,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
             return New;
         }
 
-        if (mSettings_->posix()) {
+        if (mSettings_->hasLib("posix")) {
             if (Token::Match(tok2, "open|openat|creat|mkstemp|mkostemp|socket (")) {
                 // simple sanity check of function parameters..
                 // TODO: Make such check for all these functions
@@ -237,7 +237,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getDeallocationType(const Token *tok
                 if (tok->str() == "realloc" && Token::simpleMatch(vartok->next(), ", 0 )"))
                     return Malloc;
 
-                if (mSettings_->posix()) {
+                if (mSettings_->hasLib("posix")) {
                     if (tok->str() == "close")
                         return Fd;
                     if (tok->str() == "pclose")
@@ -276,7 +276,7 @@ bool CheckMemoryLeak::isReopenStandardStream(const Token *tok) const
 
 bool CheckMemoryLeak::isOpenDevNull(const Token *tok) const
 {
-    if (mSettings_->posix() && tok->str() == "open" && numberOfArguments(tok) == 2) {
+    if (mSettings_->hasLib("posix") && tok->str() == "open" && numberOfArguments(tok) == 2) {
         const Token* arg = getArguments(tok).at(0);
         if (Token::simpleMatch(arg, "\"/dev/null\""))
             return true;

lib/settings.h

@@ -417,9 +417,9 @@ class CPPCHECKLIB Settings : public cppcheck::Platform {
      */
     bool isEnabled(const ValueFlow::Value *value, bool inconclusiveCheck=false) const;
 
-    /** Is posix library specified? */
-    bool posix() const {
-        return std::find(libraries.cbegin(), libraries.cend(), "posix") != libraries.cend();
+    /** Is library specified? */
+    bool hasLib(const std::string &lib) const {
+        return std::find(libraries.cbegin(), libraries.cend(), lib) != libraries.cend();
     }
 
     /** @brief Request termination of checking */