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

Coding fixes and refactorings

This commit is contained in:
PKEuS 2011-12-01 19:43:51 +01:00 committed by Daniel Marjamäki
parent c7e2a198cb
commit 5017646488
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/checkother.cpp
View File

@ -1302,13 +1302,14 @@ void CheckOther::checkWrongPrintfScanfArguments()
if (i == formatString.end()) if (i == formatString.end())
break; break;
} else if (percent) { } else if (percent) {
while (!std::isalpha(*i) && i != formatString.end()) { while (i != formatString.end() && !std::isalpha(*i)) {
if (*i == '*') if (*i == '*')
numFormat++; numFormat++;
++i; ++i;
} }
if (i == formatString.end()) if (i == formatString.end())
break; break;
if (*i != 'm') // %m is a non-standard extension that requires no parameter if (*i != 'm') // %m is a non-standard extension that requires no parameter
numFormat++; numFormat++;
@ -1471,19 +1472,16 @@ void CheckOther::checkUnsignedDivision()
return; return;
// Check for "ivar / uvar" and "uvar / ivar" // Check for "ivar / uvar" and "uvar / ivar"
std::map<unsigned int, char> varsign; std::set<unsigned int> uvars;
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) { for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) {
if (Token::Match(tok, "[{};(,] %type% %var% [;=,)]")) { if (Token::Match(tok, "[{};(,] %type% %var% [;=,)]")) {
if (tok->next()->isUnsigned()) if (tok->next()->isUnsigned())
varsign[tok->tokAt(2)->varId()] = 'u'; uvars.insert(tok->tokAt(2)->varId());
else
varsign[tok->tokAt(2)->varId()] = 's';
} }
else if (!Token::Match(tok, "[).]") && Token::Match(tok->next(), "%var% / %num%")) { else if (!Token::Match(tok, "[).]") && Token::Match(tok->next(), "%var% / %num%")) {
if (tok->strAt(3)[0] == '-') { if (tok->strAt(3)[0] == '-') {
char sign1 = varsign[tok->next()->varId()]; if (uvars.find(tok->next()->varId()) != uvars.end()) {
if (sign1 == 'u') {
udivError(tok->next()); udivError(tok->next());
} }
} }
@ -1491,8 +1489,7 @@ void CheckOther::checkUnsignedDivision()
else if (Token::Match(tok, "(|[|=|%op% %num% / %var%")) { else if (Token::Match(tok, "(|[|=|%op% %num% / %var%")) {
if (tok->strAt(1)[0] == '-') { if (tok->strAt(1)[0] == '-') {
char sign2 = varsign[tok->tokAt(3)->varId()]; if (uvars.find(tok->tokAt(3)->varId()) != uvars.end()) {
if (sign2 == 'u') {
udivError(tok->next()); udivError(tok->next());
} }
} }
@ -1955,26 +1952,25 @@ void CheckOther::strPlusChar()
return; return;
} }
bool charVars[10000] = {0}; std::set<unsigned int> charVars;
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) { for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) {
// Declaring char variable.. // Declaring char variable..
if (Token::Match(tok, "char|int|short %var% [;=]")) { if (Token::Match(tok, "char %var% [;=]")) {
unsigned int varid = tok->next()->varId(); unsigned int varid = tok->next()->varId();
if (varid > 0 && varid < 10000) if (varid > 0)
charVars[varid] = true; charVars.insert(varid);
} }
// //
else if (Token::Match(tok, "[=(] %str% + %any%")) { else if (Token::Match(tok, "[=(] %str% + %any%")) {
// char constant.. // char constant..
const std::string s = tok->strAt(3); if (tok->strAt(3)[0] == '\'')
if (s[0] == '\'')
strPlusCharError(tok->next()); strPlusCharError(tok->next());
// char variable.. // char variable..
unsigned int varid = tok->tokAt(3)->varId(); unsigned int varid = tok->tokAt(3)->varId();
if (varid > 0 && varid < 10000 && charVars[varid]) if (varid > 0 && charVars.find(varid) != charVars.end())
strPlusCharError(tok->next()); strPlusCharError(tok->next());
} }
} }