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

Fix VS compiler warning and add a const

This commit is contained in:
amai2012 2018-12-30 22:17:21 +01:00
parent 36dfa0f27a
commit f2d7cb3ab6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ctu.cpp
View File

@ -307,7 +307,7 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer *tokenizer)
for (const ValueFlow::Value &value : argtok->values()) { for (const ValueFlow::Value &value : argtok->values()) {
if (!value.isIntValue() || value.intvalue != 0 || value.isInconclusive()) if (!value.isIntValue() || value.intvalue != 0 || value.isInconclusive())
continue; continue;
struct FileInfo::FunctionCall functionCall; FileInfo::FunctionCall functionCall;
functionCall.callValueType = ValueFlow::Value::INT; functionCall.callValueType = ValueFlow::Value::INT;
functionCall.callId = getFunctionId(tokenizer, tok->astOperand1()->function()); functionCall.callId = getFunctionId(tokenizer, tok->astOperand1()->function());
functionCall.callFunctionName = tok->astOperand1()->expressionString(); functionCall.callFunctionName = tok->astOperand1()->expressionString();
@ -336,7 +336,7 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer *tokenizer)
continue; continue;
const ValueFlow::Value &v = argtok->values().front(); const ValueFlow::Value &v = argtok->values().front();
if (v.valueType == ValueFlow::Value::UNINIT && !v.isInconclusive()) { if (v.valueType == ValueFlow::Value::UNINIT && !v.isInconclusive()) {
struct FileInfo::FunctionCall functionCall; FileInfo::FunctionCall functionCall;
functionCall.callValueType = ValueFlow::Value::UNINIT; functionCall.callValueType = ValueFlow::Value::UNINIT;
functionCall.callId = getFunctionId(tokenizer, tok->astOperand1()->function()); functionCall.callId = getFunctionId(tokenizer, tok->astOperand1()->function());
functionCall.callFunctionName = tok->astOperand1()->expressionString(); functionCall.callFunctionName = tok->astOperand1()->expressionString();
@ -355,7 +355,7 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer *tokenizer)
// Nested function calls // Nested function calls
for (int argnr = 0; argnr < function->argCount(); ++argnr) { for (int argnr = 0; argnr < function->argCount(); ++argnr) {
const Token *tok; const Token *tok;
int argnr2 = isCallFunction(&scope, argnr, &tok); const int argnr2 = isCallFunction(&scope, argnr, &tok);
if (argnr2 > 0) { if (argnr2 > 0) {
FileInfo::NestedCall nestedCall(tokenizer, function, tok); FileInfo::NestedCall nestedCall(tokenizer, function, tok);
nestedCall.myArgNr = argnr + 1; nestedCall.myArgNr = argnr + 1;