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

Cppcheck: Fixed Cppcheck warning about variable scope

This commit is contained in:
Daniel Marjamäki 2012-09-15 15:54:52 +02:00
parent 2acda0854b
commit 7ec825cd5d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/checkother.cpp
View File

@ -3401,7 +3401,6 @@ void CheckOther::avoidDeadEndInNestedIfs()
if (scope->type == Scope::eIf && toke) {
int flag = 0;
const Token *op1Tok, *op2Tok;
op1Tok = scope->classDef->tokAt(2);
op2Tok = scope->classDef->tokAt(4);
@ -3409,6 +3408,8 @@ void CheckOther::avoidDeadEndInNestedIfs()
if (scope->classDef->strAt(6) == "{") {
if (scope->classDef->strAt(3) == "==") {
int flag = 0;
for (const Token* tok = scope->classStart; tok != scope->classEnd && flag == 0; tok = tok->next()) {
if ((tok->str() == op1Tok->str() || tok->str() == op2Tok->str()) && tok->strAt(1) == "=")
break;
@ -3428,6 +3429,8 @@ void CheckOther::avoidDeadEndInNestedIfs()
}
}
} else if (scope->classDef->strAt(3) == "!=") {
int flag = 0;
for (const Token* tok = scope->classStart; tok != scope->classEnd && flag == 0; tok = tok->next()) {
if ((tok->str() == op1Tok->str() || tok->str() == op2Tok->str()) && tok->strAt(1) == "=")
break;
@ -3447,6 +3450,8 @@ void CheckOther::avoidDeadEndInNestedIfs()
}
}
} else if (scope->classDef->strAt(3) == "<") {
int flag = 0;
for (const Token* tok = scope->classStart; tok != scope->classEnd && flag == 0; tok = tok->next()) {
if ((tok->str() == op1Tok->str() || tok->str() == op2Tok->str()) && tok->strAt(1) == "=")
break;
@ -3466,6 +3471,8 @@ void CheckOther::avoidDeadEndInNestedIfs()
}
}
} else if (scope->classDef->strAt(3) == "<=") {
int flag = 0;
for (const Token* tok = scope->classStart; tok != scope->classEnd && flag == 0; tok = tok->next()) {
if ((tok->str() == op1Tok->str() || tok->str() == op2Tok->str()) && tok->strAt(1) == "=")
break;