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

astyle fix

This commit is contained in:
Reijo Tomperi 2009-08-28 23:29:08 +03:00
parent cbc237c37b
commit bf4ac5521d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/checkmemoryleak.cpp
View File

@ -475,8 +475,8 @@ static int countParameters(const Token *tok)
const char * CheckMemoryLeakInFunction::call_func(const Token *tok, std::list<const Token *> callstack, unsigned int varid, AllocType &alloctype, AllocType &dealloctype, bool &all, unsigned int sz) const char * CheckMemoryLeakInFunction::call_func(const Token *tok, std::list<const Token *> callstack, unsigned int varid, AllocType &alloctype, AllocType &dealloctype, bool &all, unsigned int sz)
{ {
if (std::bsearch(tok->strAt(0), call_func_white_list, if (std::bsearch(tok->strAt(0), call_func_white_list,
sizeof(call_func_white_list) / sizeof(call_func_white_list[0]), sizeof(call_func_white_list) / sizeof(call_func_white_list[0]),
sizeof(call_func_white_list[0]), call_func_white_list_compare)) sizeof(call_func_white_list[0]), call_func_white_list_compare))
return 0; return 0;
if (getAllocationType(tok, varid) != No || getReallocationType(tok, varid) != No || getDeallocationType(tok, varid) != No) if (getAllocationType(tok, varid) != No || getReallocationType(tok, varid) != No || getDeallocationType(tok, varid) != No)

4
src/tokenize.cpp
View File

@ -2161,7 +2161,7 @@ bool Tokenizer::simplifyQuestionMark()
bool Tokenizer::simplifyCasts() bool Tokenizer::simplifyCasts()
{ {
createLinks(); createLinks();
bool ret = false; bool ret = false;
for (Token *tok = _tokens; tok; tok = tok->next()) for (Token *tok = _tokens; tok; tok = tok->next())
{ {
@ -3103,7 +3103,7 @@ bool Tokenizer::simplifyCalculations()
continue; continue;
// + and - are calculated after * // + and - are calculated after *
if (Token::Match(tok->next(),"[+-]")) if (Token::Match(tok->next(), "[+-]"))
{ {
if (tok->previous()->str() == "*") if (tok->previous()->str() == "*")
continue; continue;