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

Revert "Refactoring endsWith utility function" 

This reverts commit d300d1f61b.
This commit is contained in:
Daniel Marjamäki 2018-07-25 16:14:43 +02:00
parent f27baf0956
commit 58c91c4645
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkstring.cpp
View File

@ -276,8 +276,8 @@ void CheckString::checkIncorrectStringCompare()
for (const Scope * scope : symbolDatabase->functionScopes) { for (const Scope * scope : symbolDatabase->functionScopes) {
for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) { for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
// skip "assert(str && ..)" and "assert(.. && str)" // skip "assert(str && ..)" and "assert(.. && str)"
if (Token::Match(tok, "%name% (") && if ((endsWith(tok->str(), "assert", 6) || endsWith(tok->str(), "ASSERT", 6)) &&
(endsWith(tok->str(), "assert") || endsWith(tok->str(), "ASSERT")) && Token::Match(tok, "%name% (") &&
(Token::Match(tok->tokAt(2), "%str% &&") || Token::Match(tok->next()->link()->tokAt(-2), "&& %str% )"))) (Token::Match(tok->tokAt(2), "%str% &&") || Token::Match(tok->next()->link()->tokAt(-2), "&& %str% )")))
tok = tok->next()->link(); tok = tok->next()->link();

4
lib/utils.h
View File

@ -31,9 +31,9 @@ inline bool endsWith(const std::string &str, char c)
return str[str.size()-1U] == c; return str[str.size()-1U] == c;
} }
inline bool endsWith(const std::string &str, const std::string &end) inline bool endsWith(const std::string &str, const char end[], std::size_t endlen)
{ {
return (str.size() >= end.size()) && (str.compare(str.size()-end.size(), end.size(), end)==0); return (str.size() >= endlen) && (str.compare(str.size()-endlen, endlen, end)==0);
} }
inline static const char *getOrdinalText(int i) inline static const char *getOrdinalText(int i)