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

Merge pull request #334 from Dmitry-Me/ReorderChecksAndCleanupDeclarations 

Cleanup code - reorder checks and make variable declaration scope narrower
This commit is contained in:
Daniel Marjamäki 2014-06-07 18:35:03 +02:00
parent 4c7b0806aa 7692a306cd
commit 56e3e150c2
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkbufferoverrun.cpp
View File

@ -281,10 +281,10 @@ static const Token *for_init(const Token *tok, unsigned int &varid, std::string
varid = tok->varId(); varid = tok->varId();
varname = tok->str(); varname = tok->str();
tok = tok->tokAt(4);
if (varid == 0) if (varid == 0)
return 0; // failed return 0; // failed
tok = tok->tokAt(4);
} else if (Token::Match(tok, "%type% %var% = %any% ;")) { } else if (Token::Match(tok, "%type% %var% = %any% ;")) {
if (tok->tokAt(3)->isNumber()) { if (tok->tokAt(3)->isNumber()) {
init_value = tok->strAt(3); init_value = tok->strAt(3);

15
lib/tokenize.cpp
View File

@ -8772,7 +8772,7 @@ std::string Tokenizer::simplifyString(const std::string &source)
unsigned int sz = 0; // size of stringdata unsigned int sz = 0; // size of stringdata
if (str[i+1] == 'x') { if (str[i+1] == 'x') {
sz = 2; sz = 2;
while (std::isxdigit((unsigned char)str[i+sz]) && sz < 4) while (sz < 4 && std::isxdigit((unsigned char)str[i+sz]))
sz++; sz++;
if (sz > 2) { if (sz > 2) {
std::istringstream istr(str.substr(i+2, sz-2)); std::istringstream istr(str.substr(i+2, sz-2));
@ -8780,7 +8780,7 @@ std::string Tokenizer::simplifyString(const std::string &source)
} }
} else if (MathLib::isOctalDigit(str[i+1])) { } else if (MathLib::isOctalDigit(str[i+1])) {
sz = 2; sz = 2;
while (MathLib::isOctalDigit(str[i+sz]) && sz < 4) while (sz < 4 && MathLib::isOctalDigit(str[i+sz]))
sz++; sz++;
std::istringstream istr(str.substr(i+1, sz-1)); std::istringstream istr(str.substr(i+1, sz-1));
istr >> std::oct >> c; istr >> std::oct >> c;
@ -9012,7 +9012,6 @@ void Tokenizer::simplifyStructDecl()
} }
for (Token *tok = list.front(); tok; tok = tok->next()) { for (Token *tok = list.front(); tok; tok = tok->next()) {
Token *restart;
// check for start of scope and determine if it is in a function // check for start of scope and determine if it is in a function
if (tok->str() == "{") if (tok->str() == "{")
@ -9038,7 +9037,7 @@ void Tokenizer::simplifyStructDecl()
tok = next->link(); tok = next->link();
if (!tok) if (!tok)
break; // see #4869 segmentation fault in Tokenizer::simplifyStructDecl (invalid code) break; // see #4869 segmentation fault in Tokenizer::simplifyStructDecl (invalid code)
restart = next; Token *restart = next;
// check for named type // check for named type
if (Token::Match(tok->next(), "*|&| %type% ,|;|[|=")) { if (Token::Match(tok->next(), "*|&| %type% ,|;|[|=")) {
@ -9061,16 +9060,16 @@ void Tokenizer::simplifyStructDecl()
// check for anonymous struct/union // check for anonymous struct/union
else if (Token::Match(tok, "struct|union {")) { else if (Token::Match(tok, "struct|union {")) {
bool inFunction = skip.top(); const bool inFunction = skip.top();
skip.push(false); skip.push(false);
Token *tok1 = tok; Token *tok1 = tok;
restart = tok->next(); Token *restart = tok->next();
tok = tok->next()->link(); tok = tok->next()->link();
// unnamed anonymous struct/union so possibly remove it // unnamed anonymous struct/union so possibly remove it
if (tok && tok->next() && tok->next()->str() == ";") { if (tok && tok->next() && tok->next()->str() == ";") {
if (tok1->str() == "union" && inFunction) { if (inFunction && tok1->str() == "union") {
// Try to create references in the union.. // Try to create references in the union..
Token *tok2 = tok1->tokAt(2); Token *tok2 = tok1->tokAt(2);
while (tok2) { while (tok2) {
@ -9099,7 +9098,7 @@ void Tokenizer::simplifyStructDecl()
} }
// don't remove unnamed anonymous unions from a class, struct or union // don't remove unnamed anonymous unions from a class, struct or union
if (!(tok1->str() == "union" && !inFunction)) { if (!(!inFunction && tok1->str() == "union")) {
skip.pop(); skip.pop();
tok1->deleteThis(); tok1->deleteThis();
if (tok1->next() == tok) { if (tok1->next() == tok) {