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

astyle formatting

This commit is contained in:
Daniel Marjamäki 2009-07-18 20:35:22 +02:00
parent 2ba0897ecb
commit ffac9281c4
3 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/checkother.cpp
View File

@ -94,28 +94,35 @@ void CheckOther::warningRedundantCode()
* *
**/ **/
if (Token::simpleMatch(tok2, "0 !=")) { if (Token::simpleMatch(tok2, "0 !="))
{
tok2 = tok2->tokAt(2); tok2 = tok2->tokAt(2);
} }
if (Token::simpleMatch(tok2, "this .") || if (Token::simpleMatch(tok2, "this .") ||
Token::Match(tok2, "%var% ::")) { Token::Match(tok2, "%var% ::"))
{
tok2 = tok2->tokAt(2); tok2 = tok2->tokAt(2);
} }
if (Token::Match(tok2, "%var%")) { if (Token::Match(tok2, "%var%"))
{
varname = tok2->strAt(0); varname = tok2->strAt(0);
tok2 = tok2->next(); tok2 = tok2->next();
} }
if (Token::simpleMatch(tok2, "!= 0")) { if (Token::simpleMatch(tok2, "!= 0"))
{
tok2 = tok2->tokAt(2); tok2 = tok2->tokAt(2);
} }
if (tok2->str() == ")") { if (tok2->str() == ")")
{
tok2 = tok2->next(); tok2 = tok2->next();
} else { }
else
{
varname = NULL; varname = NULL;
} }
@ -147,45 +154,60 @@ void CheckOther::warningRedundantCode()
* *
**/ **/
if (Token::Match(tok2, "free|kfree (")) { if (Token::Match(tok2, "free|kfree ("))
{
tok2 = tok2->tokAt(2); tok2 = tok2->tokAt(2);
funcHasBracket = true; funcHasBracket = true;
} else if (tok2->str() == "delete") { }
else if (tok2->str() == "delete")
{
tok2 = tok2->next(); tok2 = tok2->next();
if (Token::simpleMatch(tok2, "[ ]")) { if (Token::simpleMatch(tok2, "[ ]"))
{
tok2 = tok2->tokAt(2); tok2 = tok2->tokAt(2);
} }
} }
if (Token::simpleMatch(tok2, "this .") || if (Token::simpleMatch(tok2, "this .") ||
Token::Match(tok2, "%var% ::")) { Token::Match(tok2, "%var% ::"))
{
tok2 = tok2->tokAt(2); tok2 = tok2->tokAt(2);
} }
if (Token::Match(tok2, "%var%") && (strcmp(tok2->strAt(0), varname) == 0)) { if (Token::Match(tok2, "%var%") && (strcmp(tok2->strAt(0), varname) == 0))
{
tok2 = tok2->next(); tok2 = tok2->next();
err = true; err = true;
} }
if (funcHasBracket) { if (funcHasBracket)
if (tok2->str() != ")") { {
if (tok2->str() != ")")
{
err = false; err = false;
} else { }
else
{
tok2 = tok2->next(); tok2 = tok2->next();
} }
} }
if (tok2->str() != ";") { if (tok2->str() != ";")
{
err = false; err = false;
} else { }
else
{
tok2 = tok2->next(); tok2 = tok2->next();
} }
if (ifHasBracket) { if (ifHasBracket)
if (tok2->str() != "}") { {
if (tok2->str() != "}")
{
err = false; err = false;
} }
} }

3
test/testmemleak.cpp
View File

@ -2405,7 +2405,8 @@ private:
ASSERT_EQUALS("[test.cpp:22]: (error) Resource leak: f\n", errout.str()); ASSERT_EQUALS("[test.cpp:22]: (error) Resource leak: f\n", errout.str());
} }
void getc_function() { void getc_function()
{
{ {
check("void f()\n" check("void f()\n"
"{" "{"

8
test/testtokenize.cpp
View File

@ -1347,10 +1347,10 @@ private:
{ {
const std::string code("void f()\n" const std::string code("void f()\n"
"{\n" "{\n"
" std::vector<int> b;\n" " std::vector<int> b;\n"
" std::vector<int> &a = b;\n" " std::vector<int> &a = b;\n"
" std::vector<int> *c = &b;\n" " std::vector<int> *c = &b;\n"
"}\n"); "}\n");
// tokenize.. // tokenize..
Tokenizer tokenizer; Tokenizer tokenizer;