Refactorization: Removed whitespaces at the end of a token
Removed a redundant 'void'
This commit is contained in:
parent
ddf34440b6
commit
dfd9d32c4b
|
@ -577,7 +577,7 @@ void CheckClass::initializeVarList(const Function &func, std::list<const Functio
|
||||||
ftok = ftok->tokAt(2);
|
ftok = ftok->tokAt(2);
|
||||||
|
|
||||||
// Skip "classname :: "
|
// Skip "classname :: "
|
||||||
if (Token::Match(ftok, ":: %var% "))
|
if (Token::Match(ftok, ":: %var%"))
|
||||||
ftok = ftok->next();
|
ftok = ftok->next();
|
||||||
while (Token::Match(ftok, "%var% ::"))
|
while (Token::Match(ftok, "%var% ::"))
|
||||||
ftok = ftok->tokAt(2);
|
ftok = ftok->tokAt(2);
|
||||||
|
|
|
@ -2566,7 +2566,7 @@ void CheckOther::checkInvalidFree()
|
||||||
|
|
||||||
// If a previously-allocated pointer is assigned a completely new value,
|
// If a previously-allocated pointer is assigned a completely new value,
|
||||||
// we can't know if any subsequent free() on that pointer is valid or not.
|
// we can't know if any subsequent free() on that pointer is valid or not.
|
||||||
else if (Token::Match(tok, "%var% = ")) {
|
else if (Token::Match(tok, "%var% =")) {
|
||||||
allocatedVariables.erase(tok->varId());
|
allocatedVariables.erase(tok->varId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2819,18 +2819,18 @@ void CheckOther::checkAlwaysTrueOrFalseStringCompare()
|
||||||
|
|
||||||
for (const Token* tok = _tokenizer->tokens(); tok; tok = tok->next()) {
|
for (const Token* tok = _tokenizer->tokens(); tok; tok = tok->next()) {
|
||||||
if (Token::Match(tok, "strncmp|strcmp|stricmp|strcmpi|strcasecmp|wcscmp|wcsncmp (")) {
|
if (Token::Match(tok, "strncmp|strcmp|stricmp|strcmpi|strcasecmp|wcscmp|wcsncmp (")) {
|
||||||
if (Token::Match(tok->tokAt(2), "%str% , %str% ")) {
|
if (Token::Match(tok->tokAt(2), "%str% , %str%")) {
|
||||||
const std::string &str1 = tok->strAt(2);
|
const std::string &str1 = tok->strAt(2);
|
||||||
const std::string &str2 = tok->strAt(4);
|
const std::string &str2 = tok->strAt(4);
|
||||||
alwaysTrueFalseStringCompareError(tok, str1, str2);
|
alwaysTrueFalseStringCompareError(tok, str1, str2);
|
||||||
tok = tok->tokAt(5);
|
tok = tok->tokAt(5);
|
||||||
} else if (Token::Match(tok->tokAt(2), "%var% , %var% ")) {
|
} else if (Token::Match(tok->tokAt(2), "%var% , %var%")) {
|
||||||
const std::string &str1 = tok->strAt(2);
|
const std::string &str1 = tok->strAt(2);
|
||||||
const std::string &str2 = tok->strAt(4);
|
const std::string &str2 = tok->strAt(4);
|
||||||
if (str1 == str2)
|
if (str1 == str2)
|
||||||
alwaysTrueStringVariableCompareError(tok, str1, str2);
|
alwaysTrueStringVariableCompareError(tok, str1, str2);
|
||||||
tok = tok->tokAt(5);
|
tok = tok->tokAt(5);
|
||||||
} else if (Token::Match(tok->tokAt(2), "%var% . c_str ( ) , %var% . c_str ( ) ")) {
|
} else if (Token::Match(tok->tokAt(2), "%var% . c_str ( ) , %var% . c_str ( )")) {
|
||||||
const std::string &str1 = tok->strAt(2);
|
const std::string &str1 = tok->strAt(2);
|
||||||
const std::string &str2 = tok->strAt(8);
|
const std::string &str2 = tok->strAt(8);
|
||||||
if (str1 == str2)
|
if (str1 == str2)
|
||||||
|
@ -2923,7 +2923,7 @@ void CheckOther::suspiciousStringCompareError(const Token* tok, const std::strin
|
||||||
// Reference:
|
// Reference:
|
||||||
// - http://www.cplusplus.com/reference/cmath/
|
// - http://www.cplusplus.com/reference/cmath/
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalse(void)
|
void CheckOther::checkComparisonFunctionIsAlwaysTrueOrFalse()
|
||||||
{
|
{
|
||||||
if (!_settings->isEnabled("warning"))
|
if (!_settings->isEnabled("warning"))
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -266,7 +266,7 @@ public:
|
||||||
void checkCastIntToCharAndBack();
|
void checkCastIntToCharAndBack();
|
||||||
|
|
||||||
/** @brief %Check for using of comparison functions evaluating always to true or false. */
|
/** @brief %Check for using of comparison functions evaluating always to true or false. */
|
||||||
void checkComparisonFunctionIsAlwaysTrueOrFalse(void);
|
void checkComparisonFunctionIsAlwaysTrueOrFalse();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool isUnsigned(const Variable *var) const;
|
bool isUnsigned(const Variable *var) const;
|
||||||
|
|
|
@ -2342,7 +2342,7 @@ static void setVarIdClassFunction(const std::string &classname,
|
||||||
for (Token *tok2 = startToken; tok2 && tok2 != endToken; tok2 = tok2->next()) {
|
for (Token *tok2 = startToken; tok2 && tok2 != endToken; tok2 = tok2->next()) {
|
||||||
if (tok2->varId() != 0 || !tok2->isName())
|
if (tok2->varId() != 0 || !tok2->isName())
|
||||||
continue;
|
continue;
|
||||||
if (Token::Match(tok2->tokAt(-2), ("!!"+classname+" :: ").c_str()))
|
if (Token::Match(tok2->tokAt(-2), ("!!"+classname+" ::").c_str()))
|
||||||
continue;
|
continue;
|
||||||
if (Token::Match(tok2->tokAt(-2), "!!this . "))
|
if (Token::Match(tok2->tokAt(-2), "!!this . "))
|
||||||
continue;
|
continue;
|
||||||
|
|
Loading…
Reference in New Issue