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

Merge pull request #673 from Dmitry-Me/consistentVariableName 

Consistent variable name
This commit is contained in:
orbitcowboy 2015-09-04 16:40:46 +02:00
parent c1120c1df4 e9cb3d8c97
commit 6dbeeb1cdb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/symboldatabase.cpp
View File

@ -1888,7 +1888,7 @@ void SymbolDatabase::addNewFunction(Scope **scope, const Token **tok)
{
const Token *tok1 = *tok;
scopeList.push_back(Scope(this, tok1, *scope));
Scope *new_scope = &scopeList.back();
Scope *newScope = &scopeList.back();
// find start of function '{'
bool foundInitList = false;
@ -1907,11 +1907,11 @@ void SymbolDatabase::addNewFunction(Scope **scope, const Token **tok)
}
if (tok1 && tok1->str() == "{") {
new_scope->classStart = tok1;
new_scope->classEnd = tok1->link();
newScope->classStart = tok1;
newScope->classEnd = tok1->link();
// syntax error?
if (!new_scope->classEnd) {
if (!newScope->classEnd) {
scopeList.pop_back();
while (tok1->next())
tok1 = tok1->next();
@ -1920,8 +1920,8 @@ void SymbolDatabase::addNewFunction(Scope **scope, const Token **tok)
return;
}
(*scope)->nestedList.push_back(new_scope);
*scope = new_scope;
(*scope)->nestedList.push_back(newScope);
*scope = newScope;
*tok = tok1;
} else {
scopeList.pop_back();