Skip to content

Fix shadow warning #1175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 1 commit into from
Apr 17, 2018
Merged

Fix shadow warning #1175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lib/checkleakautovar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,12 +561,12 @@ void CheckLeakAutoVar::checkScope(const Token * const startToken,
else if (Token::Match(ftok, "auto_ptr|unique_ptr|shared_ptr < %type%")) {


const Token * endToken = ftok->linkAt(1);
if (!Token::Match(endToken, "> %var% {|( %var%"))
const Token * typeEndTok = ftok->linkAt(1);
if (!Token::Match(typeEndTok, "> %var% {|( %var%"))
continue;

bool arrayDelete = false;
if (Token::findsimplematch(ftok->next(), "[ ]", endToken))
if (Token::findsimplematch(ftok->next(), "[ ]", typeEndTok))
arrayDelete = true;

// Check deleter
Expand All @@ -575,10 +575,10 @@ void CheckLeakAutoVar::checkScope(const Token * const startToken,
const Library::AllocFunc* af = nullptr;
if (Token::Match(ftok, "unique_ptr < %type% ,")) {
deleterToken = ftok->tokAt(4);
endDeleterToken = endToken;
} else if (Token::Match(endToken, "> %var% {|( %var% ,")) {
deleterToken = endToken->tokAt(5);
endDeleterToken = endToken->linkAt(2);
endDeleterToken = typeEndTok;
} else if (Token::Match(typeEndTok, "> %var% {|( %var% ,")) {
deleterToken = typeEndTok->tokAt(5);
endDeleterToken = typeEndTok->linkAt(2);
}
if (deleterToken) {
// Check if its a pointer to a function
Expand All @@ -599,7 +599,7 @@ void CheckLeakAutoVar::checkScope(const Token * const startToken,
}
}

const Token * vtok = endToken->tokAt(3);
const Token * vtok = typeEndTok->tokAt(3);
const VarInfo::AllocInfo allocation(af ? af->groupId : (arrayDelete ? NEW_ARRAY : NEW), VarInfo::OWNED);
changeAllocStatus(varInfo, allocation, vtok, vtok);
}
Expand Down