fixed some type mismatches (based on sign mismatch compiler warnings) (#6983)

Author: firewave

lib/checkbufferoverrun.cpp

@@ -86,7 +86,7 @@ static int getMinFormatStringOutputLength(const std::vector<const Token*> &param
     bool i_d_x_f_found = false;
     int parameterLength = 0;
     int inputArgNr = formatStringArgNr;
-    for (int i = 1; i + 1 < formatString.length(); ++i) {
+    for (std::size_t i = 1; i + 1 < formatString.length(); ++i) {
         if (formatString[i] == '\\') {
             if (i < formatString.length() - 1 && formatString[i + 1] == '0')
                 break;
@@ -255,7 +255,7 @@ static std::vector<ValueFlow::Value> getOverrunIndexValues(const Token* tok,
 
     bool overflow = false;
     std::vector<ValueFlow::Value> indexValues;
-    for (int i = 0; i < dimensions.size() && i < indexTokens.size(); ++i) {
+    for (std::size_t i = 0; i < dimensions.size() && i < indexTokens.size(); ++i) {
         MathLib::bigint size = dimensions[i].num;
         if (!isArrayIndex)
             size++;
@@ -600,7 +600,7 @@ static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::Mi
     case Library::ArgumentChecks::MinSize::Type::ARGVALUE: {
         if (arg && arg->hasKnownIntValue()) {
             MathLib::bigint myMinsize = arg->getKnownIntValue();
-            const unsigned int baseSize = tokenizer->sizeOfType(minsize.baseType);
+            const int baseSize = tokenizer->sizeOfType(minsize.baseType);
             if (baseSize != 0)
                 myMinsize *= baseSize;
             return myMinsize <= bufferSize;
@@ -616,7 +616,7 @@ static bool checkBufferSize(const Token *ftok, const Library::ArgumentChecks::Mi
         break;
     case Library::ArgumentChecks::MinSize::Type::VALUE: {
         MathLib::bigint myMinsize = minsize.value;
-        const unsigned int baseSize = tokenizer->sizeOfType(minsize.baseType);
+        const int baseSize = tokenizer->sizeOfType(minsize.baseType);
         if (baseSize != 0)
             myMinsize *= baseSize;
         return myMinsize <= bufferSize;
@@ -848,7 +848,7 @@ void CheckBufferOverrun::argumentSize()
                 if (calldata->variable()->dimensions().size() != argument->dimensions().size())
                     continue;
                 bool err = false;
-                for (int d = 0; d < argument->dimensions().size(); ++d) {
+                for (std::size_t d = 0; d < argument->dimensions().size(); ++d) {
                     const auto& dim1 = calldata->variable()->dimensions()[d];
                     const auto& dim2 = argument->dimensions()[d];
                     if (!dim1.known || !dim2.known)

lib/checkclass.cpp

@@ -1322,7 +1322,7 @@ void CheckClass::privateFunctions()
             bool used = checkFunctionUsage(pf, scope); // Usage in this class
             // Check in friend classes
             const std::vector<Type::FriendInfo>& friendList = scope->definedType->friendList;
-            for (int i = 0; i < friendList.size() && !used; i++) {
+            for (std::size_t i = 0; i < friendList.size() && !used; i++) {
                 if (friendList[i].type)
                     used = checkFunctionUsage(pf, friendList[i].type->classScope);
                 else
@@ -2715,7 +2715,7 @@ void CheckClass::initializerListOrder()
                         }
                     }
 
-                    for (int j = 0; j < vars.size(); j++) {
+                    for (std::size_t j = 0; j < vars.size(); j++) {
                         // check for use of uninitialized arguments
                         for (const auto& arg : vars[j].initArgs)
                             if (vars[j].var->index() < arg->index())

lib/checkother.cpp

@@ -3765,14 +3765,14 @@ void CheckOther::funcArgOrderDifferent(const std::string & functionName,
         !definitions.empty() ? definitions[0] ? definitions[0] : definition : nullptr
     };
     std::string msg = "$symbol:" + functionName + "\nFunction '$symbol' argument order different: declaration '";
-    for (int i = 0; i < declarations.size(); ++i) {
+    for (std::size_t i = 0; i < declarations.size(); ++i) {
         if (i != 0)
             msg += ", ";
         if (declarations[i])
             msg += declarations[i]->str();
     }
     msg += "' definition '";
-    for (int i = 0; i < definitions.size(); ++i) {
+    for (std::size_t i = 0; i < definitions.size(); ++i) {
         if (i != 0)
             msg += ", ";
         if (definitions[i])

lib/clangimport.cpp

@@ -385,21 +385,21 @@ namespace clangimport {
 std::string clangimport::AstNode::getSpelling() const
 {
     if (nodeType == CompoundAssignOperator) {
-        int typeIndex = 1;
+        std::size_t typeIndex = 1;
         while (typeIndex < mExtTokens.size() && mExtTokens[typeIndex][0] != '\'')
             typeIndex++;
         // name is next quoted token
-        int nameIndex = typeIndex + 1;
+        std::size_t nameIndex = typeIndex + 1;
         while (nameIndex < mExtTokens.size() && mExtTokens[nameIndex][0] != '\'')
             nameIndex++;
         return (nameIndex < mExtTokens.size()) ? unquote(mExtTokens[nameIndex]) : "";
     }
 
     if (nodeType == UnaryExprOrTypeTraitExpr) {
-        int typeIndex = 1;
+        std::size_t typeIndex = 1;
         while (typeIndex < mExtTokens.size() && mExtTokens[typeIndex][0] != '\'')
             typeIndex++;
-        const int nameIndex = typeIndex + 1;
+        const std::size_t nameIndex = typeIndex + 1;
         return (nameIndex < mExtTokens.size()) ? unquote(mExtTokens[nameIndex]) : "";
     }
 
@@ -449,7 +449,7 @@ std::string clangimport::AstNode::getType(int index) const
 
 std::string clangimport::AstNode::getFullType(int index) const
 {
-    int typeIndex = 1;
+    std::size_t typeIndex = 1;
     while (typeIndex < mExtTokens.size() && mExtTokens[typeIndex][0] != '\'')
         typeIndex++;
     if (typeIndex >= mExtTokens.size())
@@ -867,7 +867,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         Token *expr1 = varDecl->createTokens(tokenList);
         Token *colon = addtoken(tokenList, ":");
         AstNodePtr range;
-        for (int i = 0; i < 2; i++) {
+        for (std::size_t i = 0; i < 2; i++) {
             if (children[i] && children[i]->nodeType == DeclStmt && children[i]->getChild(0)->nodeType == VarDecl) {
                 range = children[i]->getChild(0)->getChild(0);
                 break;
@@ -890,7 +890,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         return nullptr;
     }
     if (nodeType == CXXMethodDecl) {
-        for (int i = 0; i+1 < mExtTokens.size(); ++i) {
+        for (std::size_t i = 0; i+1 < mExtTokens.size(); ++i) {
             if (mExtTokens[i] == "prev" && !mData->hasDecl(mExtTokens[i+1]))
                 return nullptr;
         }
@@ -1288,11 +1288,11 @@ Token * clangimport::AstNode::createTokensCall(TokenList &tokenList)
     f->setValueType(nullptr);
     Token *par1 = addtoken(tokenList, "(");
     par1->astOperand1(f);
-    int args = 0;
+    std::size_t args = 0;
     while (args < children.size() && children[args]->nodeType != CXXDefaultArgExpr)
         args++;
     Token *child = nullptr;
-    for (int c = firstParam; c < args; ++c) {
+    for (std::size_t c = firstParam; c < args; ++c) {
         if (child) {
             Token *comma = addtoken(tokenList, ",");
             comma->setValueType(nullptr);

lib/preprocessor.cpp

@@ -542,7 +542,7 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
                 ifndef = true;
             else {
                 const std::array<std::string, 6> match{"if", "!", "defined", "(", config, ")"};
-                int i = 0;
+                std::size_t i = 0;
                 ifndef = true;
                 for (const simplecpp::Token *t = cmdtok; i < match.size(); t = t->next) {
                     if (!t || t->str() != match[i++]) {

lib/symboldatabase.cpp

@@ -1039,7 +1039,7 @@ void SymbolDatabase::createSymbolDatabaseVariableSymbolTable()
     for (Scope& scope : scopeList) {
         // add all variables
         for (Variable& var: scope.varlist) {
-            const unsigned int varId = var.declarationId();
+            const int varId = var.declarationId();
             if (varId)
                 mVariableList[varId] = &var;
             // fix up variables without type
@@ -1055,7 +1055,7 @@ void SymbolDatabase::createSymbolDatabaseVariableSymbolTable()
             for (Variable& arg: func.argumentList) {
                 // check for named parameters
                 if (arg.nameToken() && arg.declarationId()) {
-                    const unsigned int declarationId = arg.declarationId();
+                    const int declarationId = arg.declarationId();
                     mVariableList[declarationId] = &arg;
                     // fix up parameters without type
                     if (!arg.type() && !arg.typeStartToken()->isStandardType()) {
@@ -2117,7 +2117,7 @@ namespace {
     {
         if (const Scope* scope = var->nameToken()->scope()) {
             auto it = std::find_if(scope->functionList.begin(), scope->functionList.end(), [&](const Function& function) {
-                for (std::size_t arg = 0; arg < function.argCount(); ++arg) {
+                for (nonneg int arg = 0; arg < function.argCount(); ++arg) {
                     if (var == function.getArgumentVar(arg))
                         return true;
                 }
@@ -3011,7 +3011,7 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
             // remove class name
             else if (arg_path_length > 2 && first->strAt(1) != second->strAt(1)) {
                 std::string short_path = path;
-                unsigned int short_path_length = arg_path_length;
+                int short_path_length = arg_path_length;
 
                 // remove last " :: "
                 short_path.resize(short_path.size() - 4);
@@ -3034,7 +3034,7 @@ bool Function::argsMatch(const Scope *scope, const Token *first, const Token *se
 
                 param = std::move(short_path);
                 if (Token::simpleMatch(second->next(), param.c_str(), param.size())) {
-                    second = second->tokAt(int(short_path_length));
+                    second = second->tokAt(short_path_length);
                     arg_path_length = 0;
                 }
             }
@@ -5961,7 +5961,7 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst, Referen
     // Prioritize matches in derived scopes
     for (const auto& fb : { fallback1Func, fallback2Func }) {
         const Function* ret = nullptr;
-        for (int i = 0; i < fb.size(); ++i) {
+        for (std::size_t i = 0; i < fb.size(); ++i) {
             if (std::find(matches.cbegin(), matches.cend(), fb[i]) == matches.cend())
                 continue;
             if (this == fb[i]->nestedIn) {
@@ -7144,7 +7144,7 @@ static const Token* parsedecl(const Token* type,
     if (settings.debugnormal || settings.debugwarnings)
         valuetype->setDebugPath(type, loc);
     const Token * const previousType = type;
-    const unsigned int pointer0 = valuetype->pointer;
+    const int pointer0 = valuetype->pointer;
     while (Token::Match(type->previous(), "%name%") && !endsWith(type->strAt(-1), ':'))
         type = type->previous();
     valuetype->sign = ValueType::Sign::UNKNOWN_SIGN;
@@ -7477,9 +7477,9 @@ void SymbolDatabase::setValueTypeInTokenList(bool reportDebugWarnings, Token *to
         } else if (tok->isBoolean()) {
             setValueType(tok, ValueType(ValueType::Sign::UNKNOWN_SIGN, ValueType::Type::BOOL, 0U));
         } else if (tok->tokType() == Token::eChar || tok->tokType() == Token::eString) {
-            nonneg int const pointer = tok->tokType() == Token::eChar ? 0U : 1U;
-            nonneg int const constness = tok->tokType() == Token::eChar ? 0U : 1U;
-            nonneg int const volatileness = 0U;
+            nonneg int const pointer = tok->tokType() == Token::eChar ? 0 : 1;
+            nonneg int const constness = tok->tokType() == Token::eChar ? 0 : 1;
+            nonneg int const volatileness = 0;
             ValueType valuetype(ValueType::Sign::UNKNOWN_SIGN, ValueType::Type::CHAR, pointer, constness, volatileness);
 
             if (tok->isCpp() && mSettings.standards.cpp >= Standards::CPP20 && tok->isUtf8()) {

lib/tokenize.cpp

@@ -1744,7 +1744,7 @@ void Tokenizer::simplifyTypedefCpp()
                             --classLevel;
                             pattern.clear();
 
-                            for (int i = classLevel; i < spaceInfo.size(); ++i)
+                            for (std::size_t i = classLevel; i < spaceInfo.size(); ++i)
                                 pattern += (spaceInfo[i].className + " :: ");
 
                             pattern += typeName->str();
@@ -1791,7 +1791,7 @@ void Tokenizer::simplifyTypedefCpp()
                                     spaceInfo[classLevel].bodyEnd2 = tok2->link();
                                     ++classLevel;
                                     pattern.clear();
-                                    for (int i = classLevel; i < spaceInfo.size(); ++i)
+                                    for (std::size_t i = classLevel; i < spaceInfo.size(); ++i)
                                         pattern += spaceInfo[i].className + " :: ";
 
                                     pattern += typeName->str();
@@ -1880,7 +1880,7 @@ void Tokenizer::simplifyTypedefCpp()
                             }
 
                             // remove qualification if present
-                            for (int i = classLevel; i < spaceInfo.size(); ++i) {
+                            for (std::size_t i = classLevel; i < spaceInfo.size(); ++i) {
                                 if (!removed.empty())
                                     removed += " ";
                                 removed += (tok2->str() + " " + tok2->strAt(1));
@@ -2021,7 +2021,7 @@ void Tokenizer::simplifyTypedefCpp()
                             tok2 = tok2->next();
                         }
 
-                        for (int i = classLevel; i < spaceInfo.size(); ++i) {
+                        for (std::size_t i = classLevel; i < spaceInfo.size(); ++i) {
                             tok2->insertToken(spaceInfo[i].className);
                             tok2 = tok2->next();
                             tok2->insertToken("::");
@@ -7489,7 +7489,7 @@ void Tokenizer::simplifyStaticConst()
     // move 'static' before all other qualifiers and types, ...
     for (Token *tok = list.front(); tok; tok = tok->next()) {
         bool continue2 = false;
-        for (int i = 0; i < sizeof(qualifiers)/sizeof(qualifiers[0]); i++) {
+        for (std::size_t i = 0; i < sizeof(qualifiers)/sizeof(qualifiers[0]); i++) {
 
             // Keep searching for a qualifier
             if (!tok->next() || tok->strAt(1) != qualifiers[i])
@@ -7499,7 +7499,7 @@ void Tokenizer::simplifyStaticConst()
             Token* leftTok = tok;
             bool behindOther = false;
             for (; leftTok; leftTok = leftTok->previous()) {
-                for (int j = 0; j <= i; j++) {
+                for (std::size_t j = 0; j <= i; j++) {
                     if (leftTok->str() == qualifiers[j]) {
                         behindOther = true;
                         break;
@@ -7717,7 +7717,7 @@ void Tokenizer::simplifyInitVar()
                 tok1 = tok1->next();
             tok1->str(";");
 
-            const int numTokens = (Token::Match(tok, "class|struct|union")) ? 2U : 1U;
+            const int numTokens = (Token::Match(tok, "class|struct|union")) ? 2 : 1;
             TokenList::insertTokens(tok1, tok, numTokens);
             tok = initVar(tok);
         }
@@ -8171,7 +8171,7 @@ void Tokenizer::cppcheckError(const Token *tok) const
 void Tokenizer::unhandledCharLiteral(const Token *tok, const std::string& msg) const
 {
     std::string s = tok ? (" " + tok->str()) : "";
-    for (int i = 0; i < s.size(); ++i) {
+    for (std::size_t i = 0; i < s.size(); ++i) {
         if ((unsigned char)s[i] >= 0x80)
             s.clear();
     }

lib/valueflow.cpp

@@ -4090,7 +4090,7 @@ static void valueFlowFunctionDefaultParameter(const TokenList& tokenlist, const
         const Function* function = scope->function;
         if (!function)
             continue;
-        for (std::size_t arg = function->minArgCount(); arg < function->argCount(); arg++) {
+        for (nonneg int arg = function->minArgCount(); arg < function->argCount(); arg++) {
             const Variable* var = function->getArgumentVar(arg);
             if (var && var->hasDefault() && Token::Match(var->nameToken(), "%var% = %num%|%str%|%char%|%name% [,)]")) {
                 const std::list<ValueFlow::Value> &values = var->nameToken()->tokAt(2)->values();

test/testprocessexecutor.cpp

@@ -120,7 +120,7 @@ class TestProcessExecutorBase : public TestFixture {
         ASSERT_EQUALS(opt.executeCommandCalled, executeCommandCalled);
         ASSERT_EQUALS(opt.exe, exe);
         ASSERT_EQUALS(opt.args.size(), args.size());
-        for (int i = 0; i < args.size(); ++i)
+        for (std::size_t i = 0; i < args.size(); ++i)
         {
             ASSERT_EQUALS(opt.args[i], args[i]);
         }

test/testsingleexecutor.cpp

@@ -127,7 +127,7 @@ class TestSingleExecutorBase : public TestFixture {
         ASSERT_EQUALS(opt.executeCommandCalled, executeCommandCalled);
         ASSERT_EQUALS(opt.exe, exe);
         ASSERT_EQUALS(opt.args.size(), args.size());
-        for (int i = 0; i < args.size(); ++i)
+        for (std::size_t i = 0; i < args.size(); ++i)
         {
             ASSERT_EQUALS(opt.args[i], args[i]);
         }

test/testthreadexecutor.cpp

@@ -121,7 +121,7 @@ class TestThreadExecutorBase : public TestFixture {
         ASSERT_EQUALS(opt.executeCommandCalled, executeCommandCalled);
         ASSERT_EQUALS(opt.exe, exe);
         ASSERT_EQUALS(opt.args.size(), args.size());
-        for (int i = 0; i < args.size(); ++i)
+        for (std::size_t i = 0; i < args.size(); ++i)
         {
             ASSERT_EQUALS(opt.args[i], args[i]);
         }