walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Rename constArgument to knownArgument (#2616)

This commit is contained in:
Paul Fultz II 2020-04-22 02:13:35 -05:00 committed by GitHub
parent 05dcb9a435
commit d88557bc18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkother.cpp
View File

@ -3015,7 +3015,7 @@ static bool isVariableExpression(const Token* tok)
return false; return false;
} }
void CheckOther::checkConstArgument() void CheckOther::checkKnownArgument()
{ {
if (!mSettings->isEnabled(Settings::STYLE)) if (!mSettings->isEnabled(Settings::STYLE))
return; return;
@ -3041,12 +3041,12 @@ void CheckOther::checkConstArgument()
tok2 = tok2->astOperand2(); tok2 = tok2->astOperand2();
if (isVariableExpression(tok2)) if (isVariableExpression(tok2))
continue; continue;
constArgumentError(tok, tok->astParent()->previous(), &tok->values().front()); knownArgumentError(tok, tok->astParent()->previous(), &tok->values().front());
} }
} }
} }
void CheckOther::constArgumentError(const Token *tok, const Token *ftok, const ValueFlow::Value *value) void CheckOther::knownArgumentError(const Token *tok, const Token *ftok, const ValueFlow::Value *value)
{ {
MathLib::bigint intvalue = value ? value->intvalue : 0; MathLib::bigint intvalue = value ? value->intvalue : 0;
const std::string expr = tok ? tok->expressionString() : std::string("x"); const std::string expr = tok ? tok->expressionString() : std::string("x");
@ -3054,7 +3054,7 @@ void CheckOther::constArgumentError(const Token *tok, const Token *ftok, const V
const std::string errmsg = "Argument '" + expr + "' to function " + fun + " is always " + std::to_string(intvalue); const std::string errmsg = "Argument '" + expr + "' to function " + fun + " is always " + std::to_string(intvalue);
const ErrorPath errorPath = getErrorPath(tok, value, errmsg); const ErrorPath errorPath = getErrorPath(tok, value, errmsg);
reportError(errorPath, Severity::style, "constArgument", errmsg, CWE570, false); reportError(errorPath, Severity::style, "knownArgument", errmsg, CWE570, false);
} }
void CheckOther::checkComparePointers() void CheckOther::checkComparePointers()

8
lib/checkother.h
View File

@ -86,7 +86,7 @@ public:
checkOther.checkEvaluationOrder(); checkOther.checkEvaluationOrder();
checkOther.checkFuncArgNamesDifferent(); checkOther.checkFuncArgNamesDifferent();
checkOther.checkShadowVariables(); checkOther.checkShadowVariables();
checkOther.checkConstArgument(); checkOther.checkKnownArgument();
checkOther.checkComparePointers(); checkOther.checkComparePointers();
checkOther.checkIncompleteStatement(); checkOther.checkIncompleteStatement();
checkOther.checkPipeParameterSize(); checkOther.checkPipeParameterSize();
@ -211,7 +211,7 @@ public:
/** @brief %Check for shadow variables. Less noisy than gcc/clang -Wshadow. */ /** @brief %Check for shadow variables. Less noisy than gcc/clang -Wshadow. */
void checkShadowVariables(); void checkShadowVariables();
void checkConstArgument(); void checkKnownArgument();
void checkComparePointers(); void checkComparePointers();
@ -269,7 +269,7 @@ private:
void funcArgNamesDifferent(const std::string & functionName, nonneg int index, const Token* declaration, const Token* definition); void funcArgNamesDifferent(const std::string & functionName, nonneg int index, const Token* declaration, const Token* definition);
void funcArgOrderDifferent(const std::string & functionName, const Token * declaration, const Token * definition, const std::vector<const Token*> & declarations, const std::vector<const Token*> & definitions); void funcArgOrderDifferent(const std::string & functionName, const Token * declaration, const Token * definition, const std::vector<const Token*> & declarations, const std::vector<const Token*> & definitions);
void shadowError(const Token *var, const Token *shadowed, std::string type); void shadowError(const Token *var, const Token *shadowed, std::string type);
void constArgumentError(const Token *tok, const Token *ftok, const ValueFlow::Value *value); void knownArgumentError(const Token *tok, const Token *ftok, const ValueFlow::Value *value);
void comparePointersError(const Token *tok, const ValueFlow::Value *v1, const ValueFlow::Value *v2); void comparePointersError(const Token *tok, const ValueFlow::Value *v1, const ValueFlow::Value *v2);
void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const OVERRIDE { void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const OVERRIDE {
@ -335,7 +335,7 @@ private:
c.shadowError(nullptr, nullptr, "variable"); c.shadowError(nullptr, nullptr, "variable");
c.shadowError(nullptr, nullptr, "function"); c.shadowError(nullptr, nullptr, "function");
c.shadowError(nullptr, nullptr, "argument"); c.shadowError(nullptr, nullptr, "argument");
c.constArgumentError(nullptr, nullptr, nullptr); c.knownArgumentError(nullptr, nullptr, nullptr);
c.comparePointersError(nullptr, nullptr, nullptr); c.comparePointersError(nullptr, nullptr, nullptr);
c.redundantAssignmentError(nullptr, nullptr, "var", false); c.redundantAssignmentError(nullptr, nullptr, "var", false);
c.redundantInitializationError(nullptr, nullptr, "var", false); c.redundantInitializationError(nullptr, nullptr, "var", false);