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

CheckBufferOverrun: Fixed Cppcheck warning 'variable scope can be reduced' (found by travis)

This commit is contained in:
Daniel Marjamäki 2013-03-14 18:25:28 +01:00
parent 096fa2f771
commit fe046a3350
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/checkbufferoverrun.cpp
View File

@ -1511,9 +1511,6 @@ void CheckBufferOverrun::checkStructVariable()
// check all variables to see if they are arrays // check all variables to see if they are arrays
std::list<Variable>::const_iterator var; std::list<Variable>::const_iterator var;
for (var = scope->varlist.begin(); var != scope->varlist.end(); ++var) { for (var = scope->varlist.begin(); var != scope->varlist.end(); ++var) {
// find all array variables
int numOfDimension = -1;
if (var->isArray()) { if (var->isArray()) {
// create ArrayInfo from the array variable // create ArrayInfo from the array variable
ArrayInfo arrayInfo(&*var, _tokenizer); ArrayInfo arrayInfo(&*var, _tokenizer);
@ -1555,15 +1552,18 @@ void CheckBufferOverrun::checkStructVariable()
if (tok3->str() != scope->className) if (tok3->str() != scope->className)
continue; continue;
// find all array variables
int posOfSemicolon = -1;
// Declare variable: Fred fred1; // Declare variable: Fred fred1;
if (Token::Match(tok3->next(), "%var% ;")) if (Token::Match(tok3->next(), "%var% ;"))
varname[0] = tok3->strAt(1); varname[0] = tok3->strAt(1);
else if (isArrayOfStruct(tok3,numOfDimension)) { else if (isArrayOfStruct(tok3,posOfSemicolon)) {
varname[0] = tok3->strAt(1); varname[0] = tok3->strAt(1);
int pos = 2; int pos = 2;
for (int k = 0 ; k < numOfDimension; k++) { for (int k = 0 ; k < posOfSemicolon; k++) {
for (int index = pos; index < (pos + 3); index++) for (int index = pos; index < (pos + 3); index++)
tok3->strAt(index); tok3->strAt(index);
pos += 3; pos += 3;