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

Consistent variable name

This commit is contained in:
Dmitry-Me 2015-09-04 17:00:44 +03:00
parent c1120c1df4
commit e9cb3d8c97
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; const Token *tok1 = *tok;
scopeList.push_back(Scope(this, tok1, *scope)); scopeList.push_back(Scope(this, tok1, *scope));
Scope *new_scope = &scopeList.back(); Scope *newScope = &scopeList.back();
// find start of function '{' // find start of function '{'
bool foundInitList = false; bool foundInitList = false;
@ -1907,11 +1907,11 @@ void SymbolDatabase::addNewFunction(Scope **scope, const Token **tok)
} }
if (tok1 && tok1->str() == "{") { if (tok1 && tok1->str() == "{") {
new_scope->classStart = tok1; newScope->classStart = tok1;
new_scope->classEnd = tok1->link(); newScope->classEnd = tok1->link();
// syntax error? // syntax error?
if (!new_scope->classEnd) { if (!newScope->classEnd) {
scopeList.pop_back(); scopeList.pop_back();
while (tok1->next()) while (tok1->next())
tok1 = tok1->next(); tok1 = tok1->next();
@ -1920,8 +1920,8 @@ void SymbolDatabase::addNewFunction(Scope **scope, const Token **tok)
return; return;
} }
(*scope)->nestedList.push_back(new_scope); (*scope)->nestedList.push_back(newScope);
*scope = new_scope; *scope = newScope;
*tok = tok1; *tok = tok1;
} else { } else {
scopeList.pop_back(); scopeList.pop_back();