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

astyle formatting 

[ci skip]
This commit is contained in:
Daniel Marjamäki 2018-04-16 12:55:37 +02:00
parent 9579b12be9
commit a4f8c44432
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/checkleakautovar.cpp
View File

@ -562,25 +562,25 @@ void CheckLeakAutoVar::checkScope(const Token * const startToken,
const Token * endToken = ftok->linkAt(1);
if(!Token::Match(endToken, "> %var% {|( %var%"))
if (!Token::Match(endToken, "> %var% {|( %var%"))
continue;
bool arrayDelete = false;
if(Token::findsimplematch(ftok->next(), "[ ]", endToken))
if (Token::findsimplematch(ftok->next(), "[ ]", endToken))
arrayDelete = true;
// Check deleter
const Token * deleterToken = nullptr;
const Token * endDeleterToken = nullptr;
const Library::AllocFunc* af = nullptr;
if(Token::Match(ftok, "unique_ptr < %type% ,")) {
if (Token::Match(ftok, "unique_ptr < %type% ,")) {
deleterToken = ftok->tokAt(4);
endDeleterToken = endToken;
} else if(Token::Match(endToken, "> %var% {|( %var% ,")) {
} else if (Token::Match(endToken, "> %var% {|( %var% ,")) {
deleterToken = endToken->tokAt(5);
endDeleterToken = endToken->linkAt(2);
}
if(deleterToken) {
if (deleterToken) {
// Check if its a pointer to a function
const Token * dtok = Token::findmatch(deleterToken, "& %name%", endDeleterToken);
if (dtok) {
@ -592,7 +592,7 @@ void CheckLeakAutoVar::checkScope(const Token * const startToken,
const Scope * tscope = dtok->type()->classScope;
for (const Token *tok2 = tscope->classStart; tok2 != tscope->classEnd; tok2 = tok2->next()) {
af = _settings->library.dealloc(tok2);
if (af)
if (af)
break;
}
}

3
lib/checkleakautovar.h
View File

@ -48,8 +48,7 @@ public:
int type;
AllocInfo(int type_ = 0, AllocStatus status_ = NOALLOC) : status(status_), type(type_) {}
bool managed() const
{
bool managed() const {
return status < 0;
}
};

2
test/testleakautovar.cpp
View File

@ -105,7 +105,7 @@ private:
// mismatching allocation/deallocation
TEST_CASE(mismatchAllocDealloc);
TEST_CASE(smartPointerDeleter);
// Execution reaches a 'return'