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

Refactorization: Avoid string copying.

This commit is contained in:
PKEuS 2014-10-31 17:17:25 +01:00
parent 9b0b7a77b6
commit f8371f65f0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tokenize.cpp
View File

@ -5955,7 +5955,7 @@ void Tokenizer::simplifyVariableMultipleAssign()
Token *stopAt = tok->tokAt(2); Token *stopAt = tok->tokAt(2);
const Token *valueTok = tok->tokAt(4); const Token *valueTok = tok->tokAt(4);
const std::string value(valueTok->str()); const std::string& value(valueTok->str());
tok2 = tok2->next(); tok2 = tok2->next();
while (tok2 != stopAt) { while (tok2 != stopAt) {
@ -6037,7 +6037,7 @@ void Tokenizer::simplifyIfNotNull()
// Remove 'x = (x != 0)' // Remove 'x = (x != 0)'
if (Token::simpleMatch(tok, "= (")) { if (Token::simpleMatch(tok, "= (")) {
if (Token::Match(tok->tokAt(-2), "[;{}] %var%")) { if (Token::Match(tok->tokAt(-2), "[;{}] %var%")) {
const std::string varname(tok->previous()->str()); const std::string& varname(tok->previous()->str());
if (Token::simpleMatch(tok->tokAt(2), (varname + " != 0 ) ;").c_str()) || if (Token::simpleMatch(tok->tokAt(2), (varname + " != 0 ) ;").c_str()) ||
Token::simpleMatch(tok->tokAt(2), ("0 != " + varname + " ) ;").c_str())) { Token::simpleMatch(tok->tokAt(2), ("0 != " + varname + " ) ;").c_str())) {
@ -8037,7 +8037,7 @@ bool Tokenizer::isFunctionParameterPassedByValue(const Token *fpar) const
// Is this a function call? // Is this a function call?
if (ftok && Token::Match(ftok->tokAt(-2), "[;{}=] %var% (")) { if (ftok && Token::Match(ftok->tokAt(-2), "[;{}=] %var% (")) {
const std::string functionName(ftok->previous()->str()); const std::string& functionName(ftok->previous()->str());
if (functionName == "return") if (functionName == "return")
return true; return true;