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

Rephraze performance message. /would be faster/could be faster/ to indicate that Cppcheck is not _sure_ that it would be faster

This commit is contained in:
Daniel Marjamäki 2019-07-17 16:06:10 +02:00
parent 40600cbc38
commit 90a215af0e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkstl.cpp
View File

@ -1228,7 +1228,7 @@ void CheckStl::if_findError(const Token *tok, bool str)
{ {
if (str && mSettings->standards.cpp >= Standards::CPP20) if (str && mSettings->standards.cpp >= Standards::CPP20)
reportError(tok, Severity::performance, "stlIfStrFind", reportError(tok, Severity::performance, "stlIfStrFind",
"Inefficient usage of string::find() in condition; string::starts_with() would be faster.\n" "Inefficient usage of string::find() in condition; string::starts_with() could be faster.\n"
"Either inefficient or wrong usage of string::find(). string::starts_with() will be faster if " "Either inefficient or wrong usage of string::find(). string::starts_with() will be faster if "
"string::find's result is compared with 0, because it will not scan the whole " "string::find's result is compared with 0, because it will not scan the whole "
"string. If your intention is to check that there are no findings in the string, " "string. If your intention is to check that there are no findings in the string, "

10
test/teststl.cpp
View File

@ -2391,35 +2391,35 @@ private:
"{\n" "{\n"
" if (s.find(\"abc\")) { }\n" " if (s.find(\"abc\")) { }\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() would be faster.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster.\n", errout.str());
// error (pointer) // error (pointer)
check("void f(const std::string *s)\n" check("void f(const std::string *s)\n"
"{\n" "{\n"
" if ((*s).find(\"abc\")) { }\n" " if ((*s).find(\"abc\")) { }\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() would be faster.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster.\n", errout.str());
// error (pointer) // error (pointer)
check("void f(const std::string *s)\n" check("void f(const std::string *s)\n"
"{\n" "{\n"
" if (s->find(\"abc\")) { }\n" " if (s->find(\"abc\")) { }\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() would be faster.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster.\n", errout.str());
// error (vector) // error (vector)
check("void f(const std::vector<std::string> &s)\n" check("void f(const std::vector<std::string> &s)\n"
"{\n" "{\n"
" if (s[0].find(\"abc\")) { }\n" " if (s[0].find(\"abc\")) { }\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() would be faster.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster.\n", errout.str());
// #3162 // #3162
check("void f(const std::string& s1, const std::string& s2)\n" check("void f(const std::string& s1, const std::string& s2)\n"
"{\n" "{\n"
" if ((!s1.empty()) && (0 == s1.find(s2))) { }\n" " if ((!s1.empty()) && (0 == s1.find(s2))) { }\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() would be faster.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (performance) Inefficient usage of string::find() in condition; string::starts_with() could be faster.\n", errout.str());
// #4102 // #4102
check("void f(const std::string &define) {\n" check("void f(const std::string &define) {\n"