fixed many COPY_INSTEAD_OF_MOVE Coverity warnings (#5944)

danmar · Feb 5, 2024 · a2ecf17 · a2ecf17
1 parent 6802050
commit a2ecf17
Show file tree

Hide file tree

Showing 28 changed files with 96 additions and 102 deletions.
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -194,7 +194,7 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
     mStdLogger = new StdLogger(settings);
 
     CppCheck cppCheck(*mStdLogger, true, executeCommand);
-    cppCheck.settings() = settings;
+    cppCheck.settings() = settings; // this is a copy
 
     const int ret = check_wrapper(cppCheck);
 

diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
@@ -392,7 +392,7 @@ void ProcessExecutor::reportInternalChildErr(const std::string &childname, const
 {
     std::list<ErrorMessage::FileLocation> locations;
     locations.emplace_back(childname, 0, 0);
-    const ErrorMessage errmsg(locations,
+    const ErrorMessage errmsg(std::move(locations),
                               emptyString,
                               Severity::error,
                               "Internal error: " + msg,

diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -3255,7 +3255,7 @@ bool isConstVarExpression(const Token *tok, std::function<bool(const Token*)> sk
     if (Token::Match(tok, "%cop%|[|.")) {
         if (tok->astOperand1() && !isConstVarExpression(tok->astOperand1(), skipPredicate))
             return false;
-        if (tok->astOperand2() && !isConstVarExpression(tok->astOperand2(), skipPredicate))
+        if (tok->astOperand2() && !isConstVarExpression(tok->astOperand2(), std::move(skipPredicate)))
             return false;
         return true;
     }

diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp
@@ -575,7 +575,7 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
             ErrorPath errorPath;
             const Variable *var = ValueFlow::getLifetimeVariable(tok, errorPath);
             if (var && isInScope(var->nameToken(), tok->scope())) {
-                errorDanglingReference(tok, var, errorPath);
+                errorDanglingReference(tok, var, std::move(errorPath));
                 continue;
             }
             // Reference to temporary

diff --git a/lib/checkautovariables.h b/lib/checkautovariables.h
@@ -91,13 +91,12 @@ class CPPCHECKLIB CheckAutoVariables : public Check {
     void errorUselessAssignmentPtrArg(const Token *tok);
 
     void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
-        ErrorPath errorPath;
         CheckAutoVariables c(nullptr,settings,errorLogger);
         c.errorAutoVariableAssignment(nullptr, false);
-        c.errorReturnReference(nullptr, errorPath, false);
-        c.errorDanglingReference(nullptr, nullptr, errorPath);
-        c.errorReturnTempReference(nullptr, errorPath, false);
-        c.errorDanglingTempReference(nullptr, errorPath, false);
+        c.errorReturnReference(nullptr, ErrorPath{}, false);
+        c.errorDanglingReference(nullptr, nullptr, ErrorPath{});
+        c.errorReturnTempReference(nullptr, ErrorPath{}, false);
+        c.errorDanglingTempReference(nullptr, ErrorPath{}, false);
         c.errorInvalidDeallocation(nullptr, nullptr);
         c.errorUselessAssignmentArg(nullptr);
         c.errorUselessAssignmentPtrArg(nullptr);

diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -3343,7 +3343,7 @@ void CheckClass::checkThisUseAfterFree()
 
                 const Token * freeToken = nullptr;
                 std::set<const Function *> callstack;
-                checkThisUseAfterFreeRecursive(classScope, &func, &var, callstack, &freeToken);
+                checkThisUseAfterFreeRecursive(classScope, &func, &var, std::move(callstack), &freeToken);
             }
         }
     }
@@ -3517,7 +3517,7 @@ Check::FileInfo *CheckClass::getFileInfo(const Tokenizer *tokenizer, const Setti
             continue;
 
         MyFileInfo::NameLoc nameLoc;
-        nameLoc.className = name;
+        nameLoc.className = std::move(name);
         nameLoc.fileName = tokenizer->list.file(classScope->classDef);
         nameLoc.lineNumber = classScope->classDef->linenr();
         nameLoc.column = classScope->classDef->column();

diff --git a/lib/checkcondition.cpp b/lib/checkcondition.cpp
@@ -505,7 +505,7 @@ void CheckCondition::duplicateCondition()
         ErrorPath errorPath;
         if (!findExpressionChanged(cond1, scope.classDef->next(), cond2, mSettings, mTokenizer->isCPP()) &&
             isSameExpression(mTokenizer->isCPP(), true, cond1, cond2, mSettings->library, true, true, &errorPath))
-            duplicateConditionError(cond1, cond2, errorPath);
+            duplicateConditionError(cond1, cond2, std::move(errorPath));
     }
 }
 
@@ -558,7 +558,7 @@ void CheckCondition::multiCondition()
                 else if (isOppositeCond(
                              true, mTokenizer->isCPP(), cond1, tok2->astOperand2(), mSettings->library, true, true, &errorPath) &&
                          !findExpressionChanged(cond1, cond1, tok2->astOperand2(), mSettings, mTokenizer->isCPP()))
-                    oppositeElseIfConditionError(cond1, tok2->astOperand2(), errorPath);
+                    oppositeElseIfConditionError(cond1, tok2->astOperand2(), std::move(errorPath));
             }
         }
     }
@@ -1193,7 +1193,7 @@ void CheckCondition::checkIncorrectLogicOperator()
                     }
 
                     const std::string cond1 = expr1 + " " + tok->str() + " (" + expr2 + " " + tok->astOperand2()->str() + " " + expr3 + ")";
-                    const std::string cond2 = expr1;
+                    const std::string cond2 = std::move(expr1);
 
                     const std::string cond1VerboseMsg = expr1VerboseMsg + " " + tok->str() + " " + expr2VerboseMsg + " " + tok->astOperand2()->str() + " " + expr3VerboseMsg;
                     const std::string& cond2VerboseMsg = expr1VerboseMsg;
@@ -1316,9 +1316,10 @@ void CheckCondition::checkIncorrectLogicOperator()
             const std::string cond2str = conditionString(not2, expr2, op2, value2);
             if (printWarning && (alwaysTrue || alwaysFalse)) {
                 const std::string text = cond1str + " " + tok->str() + " " + cond2str;
-                incorrectLogicOperatorError(tok, text, alwaysTrue, inconclusive, errorPath);
+                incorrectLogicOperatorError(tok, text, alwaysTrue, inconclusive, std::move(errorPath));
             } else if (printStyle && (firstTrue || secondTrue)) {
-                const int which = isfloat ? sufficientCondition(op1, not1, d1, op2, not2, d2, isAnd) : sufficientCondition(op1, not1, i1, op2, not2, i2, isAnd);
+                // cppcheck-suppress accessMoved - TODO: FP - see #12174
+                const int which = isfloat ? sufficientCondition(std::move(op1), not1, d1, std::move(op2), not2, d2, isAnd) : sufficientCondition(std::move(op1), not1, i1, std::move(op2), not2, i2, isAnd);
                 std::string text;
                 if (which != 0) {
                     text = "The condition '" + (which == 1 ? cond2str : cond1str) + "' is redundant since '" + (which == 1 ? cond1str : cond2str) + "' is sufficient.";

diff --git a/lib/checkcondition.h b/lib/checkcondition.h
@@ -175,18 +175,16 @@ class CPPCHECKLIB CheckCondition : public Check {
     void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
         CheckCondition c(nullptr, settings, errorLogger);
 
-        ErrorPath errorPath;
-
         c.assignIfError(nullptr, nullptr, emptyString, false);
         c.badBitmaskCheckError(nullptr);
         c.comparisonError(nullptr, "&", 6, "==", 1, false);
-        c.duplicateConditionError(nullptr, nullptr, errorPath);
+        c.duplicateConditionError(nullptr, nullptr, ErrorPath{});
         c.overlappingElseIfConditionError(nullptr, 1);
         c.mismatchingBitAndError(nullptr, 0xf0, nullptr, 1);
-        c.oppositeInnerConditionError(nullptr, nullptr, errorPath);
-        c.identicalInnerConditionError(nullptr, nullptr, errorPath);
-        c.identicalConditionAfterEarlyExitError(nullptr, nullptr, errorPath);
-        c.incorrectLogicOperatorError(nullptr, "foo > 3 && foo < 4", true, false, errorPath);
+        c.oppositeInnerConditionError(nullptr, nullptr, ErrorPath{});
+        c.identicalInnerConditionError(nullptr, nullptr, ErrorPath{});
+        c.identicalConditionAfterEarlyExitError(nullptr, nullptr, ErrorPath{});
+        c.incorrectLogicOperatorError(nullptr, "foo > 3 && foo < 4", true, false, ErrorPath{});
         c.redundantConditionError(nullptr, "If x > 11 the condition x > 10 is always true.", false);
         c.moduloAlwaysTrueFalseError(nullptr, "1");
         c.clarifyConditionError(nullptr, true, false);

diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -2248,7 +2248,7 @@ void CheckOther::checkDuplicateBranch()
             ErrorPath errorPath;
             if (isSameExpression(mTokenizer->isCPP(), false, branchTop1->astOperand1(), branchTop2->astOperand1(), mSettings->library, true, true, &errorPath) &&
                 isSameExpression(mTokenizer->isCPP(), false, branchTop1->astOperand2(), branchTop2->astOperand2(), mSettings->library, true, true, &errorPath))
-                duplicateBranchError(scope.classDef, scope.bodyEnd->next(), errorPath);
+                duplicateBranchError(scope.classDef, scope.bodyEnd->next(), std::move(errorPath));
         }
     }
 }
@@ -2570,7 +2570,7 @@ void CheckOther::checkDuplicateExpression()
                     isConstStatement(tok->astOperand1(), cpp) && isConstStatement(tok->astOperand2(), cpp))
                     duplicateValueTernaryError(tok);
                 else if (isSameExpression(cpp, true, tok->astOperand1(), tok->astOperand2(), mSettings->library, false, true, &errorPath))
-                    duplicateExpressionTernaryError(tok, errorPath);
+                    duplicateExpressionTernaryError(tok, std::move(errorPath));
             }
         }
     }

diff --git a/lib/checkother.h b/lib/checkother.h
@@ -293,8 +293,6 @@ class CPPCHECKLIB CheckOther : public Check {
     void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const override {
         CheckOther c(nullptr, settings, errorLogger);
 
-        ErrorPath errorPath;
-
         // error
         c.zerodivError(nullptr, nullptr);
         c.misusedScopeObjectError(nullptr, "varname");
@@ -326,12 +324,12 @@ class CPPCHECKLIB CheckOther : public Check {
         c.selfAssignmentError(nullptr,  "varname");
         c.clarifyCalculationError(nullptr,  "+");
         c.clarifyStatementError(nullptr);
-        c.duplicateBranchError(nullptr, nullptr, errorPath);
+        c.duplicateBranchError(nullptr, nullptr, ErrorPath{});
         c.duplicateAssignExpressionError(nullptr, nullptr, true);
-        c.oppositeExpressionError(nullptr, errorPath);
-        c.duplicateExpressionError(nullptr, nullptr, nullptr, errorPath);
+        c.oppositeExpressionError(nullptr, ErrorPath{});
+        c.duplicateExpressionError(nullptr, nullptr, nullptr, ErrorPath{});
         c.duplicateValueTernaryError(nullptr);
-        c.duplicateExpressionTernaryError(nullptr, errorPath);
+        c.duplicateExpressionTernaryError(nullptr, ErrorPath{});
         c.duplicateBreakError(nullptr,  false);
         c.unreachableCodeError(nullptr, nullptr,  false);
         c.unsignedLessThanZeroError(nullptr, nullptr, "varname");

diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -260,11 +260,11 @@ void CheckStl::outOfBoundsError(const Token *tok, const std::string &containerNa
         ErrorPath errorPath1 = getErrorPath(tok, containerSize, "Access out of bounds");
         ErrorPath errorPath2 = getErrorPath(tok, indexValue, "Access out of bounds");
         if (errorPath1.size() <= 1)
-            errorPath = errorPath2;
+            errorPath = std::move(errorPath2);
         else if (errorPath2.size() <= 1)
             errorPath = errorPath1;
         else {
-            errorPath = errorPath1;
+            errorPath = std::move(errorPath1);
             errorPath.splice(errorPath.end(), errorPath2);
         }
     }
@@ -993,7 +993,7 @@ namespace {
                     ep.emplace_front(ftok,
                                      "After calling '" + ftok->expressionString() +
                                      "', iterators or references to the container's data may be invalid .");
-                    result.emplace_back(Info::Reference{tok, ep, ftok});
+                    result.emplace_back(Info::Reference{tok, std::move(ep), ftok});
                 }
             }
             return result;
@@ -1165,7 +1165,7 @@ void CheckStl::invalidContainer()
                         // Check the iterator is created before the change
                         if (val && val->tokvalue != tok && reaches(val->tokvalue, tok, library, &ep)) {
                             v = val;
-                            errorPath = ep;
+                            errorPath = std::move(ep);
                             return true;
                         }
                         return false;
@@ -1177,7 +1177,7 @@ void CheckStl::invalidContainer()
                     if (v) {
                         invalidContainerError(info.tok, r.tok, v, errorPath);
                     } else {
-                        invalidContainerReferenceError(info.tok, r.tok, errorPath);
+                        invalidContainerReferenceError(info.tok, r.tok, std::move(errorPath));
                     }
                 }
             }

diff --git a/lib/checkstl.h b/lib/checkstl.h
@@ -243,15 +243,14 @@ class CPPCHECKLIB CheckStl : public Check {
     void localMutexError(const Token *tok);
 
     void getErrorMessages(ErrorLogger* errorLogger, const Settings* settings) const override {
-        ErrorPath errorPath;
         CheckStl c(nullptr, settings, errorLogger);
         c.outOfBoundsError(nullptr, "container", nullptr, "x", nullptr);
         c.invalidIteratorError(nullptr, "iterator");
         c.iteratorsError(nullptr, "container1", "container2");
         c.iteratorsError(nullptr, nullptr, "container0", "container1");
         c.iteratorsError(nullptr, nullptr, "container");
-        c.invalidContainerLoopError(nullptr, nullptr, errorPath);
-        c.invalidContainerError(nullptr, nullptr, nullptr, errorPath);
+        c.invalidContainerLoopError(nullptr, nullptr, ErrorPath{});
+        c.invalidContainerError(nullptr, nullptr, nullptr, ErrorPath{});
         c.mismatchingContainerIteratorError(nullptr, nullptr, nullptr);
         c.mismatchingContainersError(nullptr, nullptr);
         c.mismatchingContainerExpressionError(nullptr, nullptr);

diff --git a/lib/checkuninitvar.h b/lib/checkuninitvar.h
@@ -117,8 +117,7 @@ class CPPCHECKLIB CheckUninitVar : public Check {
     void uninitdataError(const Token *tok, const std::string &varname);
     void uninitvarError(const Token *tok, const std::string &varname, ErrorPath errorPath);
     void uninitvarError(const Token *tok, const std::string &varname) {
-        ErrorPath errorPath;
-        uninitvarError(tok, varname, errorPath);
+        uninitvarError(tok, varname, ErrorPath{});
     }
     void uninitvarError(const Token *tok, const std::string &varname, Alloc alloc) {
         if (alloc == NO_CTOR_CALL || alloc == CTOR_CALL)

diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
@@ -363,7 +363,7 @@ void CheckUnusedFunctions::unusedFunctionError(ErrorLogger * const errorLogger,
         locationList.back().fileIndex = fileIndex;
     }
 
-    const ErrorMessage errmsg(locationList, emptyString, Severity::style, "$symbol:" + funcname + "\nThe function '$symbol' is never used.", "unusedFunction", CWE561, Certainty::normal);
+    const ErrorMessage errmsg(std::move(locationList), emptyString, Severity::style, "$symbol:" + funcname + "\nThe function '$symbol' is never used.", "unusedFunction", CWE561, Certainty::normal);
     if (errorLogger)
         errorLogger->reportErr(errmsg);
     else

diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
@@ -947,7 +947,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
             --addrIndex;
         const std::string addr = mExtTokens[addrIndex];
         std::string name = unquote(getSpelling());
-        Token *reftok = addtoken(tokenList, name.empty() ? "<NoName>" : name);
+        Token *reftok = addtoken(tokenList, name.empty() ? "<NoName>" : std::move(name));
         mData->ref(addr, reftok);
         return reftok;
     }
@@ -1085,10 +1085,10 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         Token *par2 = addtoken(tokenList, ")");
         par1->link(par2);
         par2->link(par1);
-        createScope(tokenList, Scope::ScopeType::eIf, thenCode, iftok);
+        createScope(tokenList, Scope::ScopeType::eIf, std::move(thenCode), iftok);
         if (elseCode) {
             elseCode->addtoken(tokenList, "else");
-            createScope(tokenList, Scope::ScopeType::eElse, elseCode, tokenList.back());
+            createScope(tokenList, Scope::ScopeType::eElse, std::move(elseCode), tokenList.back());
         }
         return nullptr;
     }
@@ -1255,7 +1255,7 @@ Token *clangimport::AstNode::createTokens(TokenList &tokenList)
         Token *par2 = addtoken(tokenList, ")");
         par1->link(par2);
         par2->link(par1);
-        createScope(tokenList, Scope::ScopeType::eWhile, body, whiletok);
+        createScope(tokenList, Scope::ScopeType::eWhile, std::move(body), whiletok);
         return nullptr;
     }
     return addtoken(tokenList, "?" + nodeType + "?");

diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -289,7 +289,7 @@ static std::vector<picojson::value> executeAddon(const AddonInfo &addonInfo,
             if (pos != std::string::npos)
                 details.resize(pos + 1);
         }
-        throw InternalError(nullptr, message, details);
+        throw InternalError(nullptr, std::move(message), std::move(details));
     }
 
     std::vector<picojson::value> addonResult;
@@ -666,7 +666,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
             const ErrorMessage::FileLocation loc1(file, output.location.line, output.location.col);
             std::list<ErrorMessage::FileLocation> callstack(1, loc1);
 
-            ErrorMessage errmsg(callstack,
+            ErrorMessage errmsg(std::move(callstack),
                                 "",
                                 Severity::error,
                                 output.msg,
@@ -1043,7 +1043,7 @@ void CppCheck::internalError(const std::string &filename, const std::string &msg
     const ErrorMessage::FileLocation loc1(filename, 0, 0);
     std::list<ErrorMessage::FileLocation> callstack(1, loc1);
 
-    ErrorMessage errmsg(callstack,
+    ErrorMessage errmsg(std::move(callstack),
                         emptyString,
                         Severity::error,
                         fullmsg,
@@ -1553,7 +1553,7 @@ void CppCheck::tooManyConfigsError(const std::string &file, const int numberOfCo
         msg << " For more details, use --enable=information.";
 
 
-    ErrorMessage errmsg(loclist,
+    ErrorMessage errmsg(std::move(loclist),
                         emptyString,
                         Severity::information,
                         msg.str(),
@@ -1575,7 +1575,7 @@ void CppCheck::purgedConfigurationMessage(const std::string &file, const std::st
         loclist.emplace_back(file);
     }
 
-    ErrorMessage errmsg(loclist,
+    ErrorMessage errmsg(std::move(loclist),
                         emptyString,
                         Severity::information,
                         "The configuration '" + configuration + "' was not checked because its code equals another one.",
@@ -1758,7 +1758,7 @@ void CppCheck::analyseClangTidy(const FileSettings &fileSettings)
         else
             errmsg.severity = Severity::style;
 
-        errmsg.file0 = fixedpath;
+        errmsg.file0 = std::move(fixedpath);
         errmsg.setmsg(messageString);
         reportErr(errmsg);
     }

diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
@@ -337,7 +337,7 @@ void ErrorMessage::deserialize(const std::string &data)
             }
         }
 
-        results[elem++] = temp;
+        results[elem++] = std::move(temp);
     }
 
     if (!iss.good())

diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -337,7 +337,7 @@ void ImportProject::fsParseCommand(FileSettings& fs, const std::string& command)
             // we can only set it globally but in this context it needs to be treated per file
         }
     }
-    fsSetDefines(fs, defs);
+    fsSetDefines(fs, std::move(defs));
 }
 
 bool ImportProject::importCompileCommands(std::istream &istr)
@@ -630,7 +630,7 @@ static void importPropertyGroup(const tinyxml2::XMLElement *node, std::map<std::
             const std::string::size_type pos = path.find("$(IncludePath)");
             if (pos != std::string::npos)
                 path.replace(pos, 14U, includePath);
-            includePath = path;
+            includePath = std::move(path);
         }
     }
 }