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

Variable name consistent with surroundings

This commit is contained in:
Dmitry-Me 2016-07-26 09:46:50 +03:00
parent 383b815cca
commit 2b31afe2ab
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/checkinternal.cpp
View File

@ -95,11 +95,11 @@ void CheckInternal::checkTokenSimpleMatchPatterns()
const std::string& funcname = tok->strAt(2); const std::string& funcname = tok->strAt(2);
// Get pattern string // Get pattern string
const Token *pattern_tok = tok->tokAt(4)->nextArgument(); const Token *patternTok = tok->tokAt(4)->nextArgument();
if (!pattern_tok || pattern_tok->tokType() != Token::eString) if (!patternTok || patternTok->tokType() != Token::eString)
continue; continue;
const std::string pattern = pattern_tok->strValue(); const std::string pattern = patternTok->strValue();
if (pattern.empty()) { if (pattern.empty()) {
complexPatternError(tok, pattern, funcname); complexPatternError(tok, pattern, funcname);
continue; continue;
@ -182,11 +182,11 @@ void CheckInternal::checkMissingPercentCharacter()
const std::string& funcname = tok->strAt(2); const std::string& funcname = tok->strAt(2);
// Get pattern string // Get pattern string
const Token *pattern_tok = tok->tokAt(4)->nextArgument(); const Token *patternTok = tok->tokAt(4)->nextArgument();
if (!pattern_tok || pattern_tok->tokType() != Token::eString) if (!patternTok || patternTok->tokType() != Token::eString)
continue; continue;
const std::string pattern = pattern_tok->strValue(); const std::string pattern = patternTok->strValue();
std::set<std::string>::const_iterator magic, magics_end = magics.end(); std::set<std::string>::const_iterator magic, magics_end = magics.end();
for (magic = magics.begin(); magic != magics_end; ++magic) { for (magic = magics.begin(); magic != magics_end; ++magic) {
@ -242,11 +242,11 @@ void CheckInternal::checkUnknownPattern()
continue; continue;
// Get pattern string // Get pattern string
const Token *pattern_tok = tok->tokAt(4)->nextArgument(); const Token *patternTok = tok->tokAt(4)->nextArgument();
if (!pattern_tok || pattern_tok->tokType() != Token::eString) if (!patternTok || patternTok->tokType() != Token::eString)
continue; continue;
const std::string pattern = pattern_tok->strValue(); const std::string pattern = patternTok->strValue();
bool inBrackets = false; bool inBrackets = false;
for (std::string::size_type j = 0; j < pattern.length() - 1; j++) { for (std::string::size_type j = 0; j < pattern.length() - 1; j++) {
@ -311,11 +311,11 @@ void CheckInternal::checkExtraWhitespace()
const std::string& funcname = tok->strAt(2); const std::string& funcname = tok->strAt(2);
// Get pattern string // Get pattern string
const Token *pattern_tok = tok->tokAt(4)->nextArgument(); const Token *patternTok = tok->tokAt(4)->nextArgument();
if (!pattern_tok || pattern_tok->tokType() != Token::eString) if (!patternTok || patternTok->tokType() != Token::eString)
continue; continue;
const std::string pattern = pattern_tok->strValue(); const std::string pattern = patternTok->strValue();
if (!pattern.empty() && (pattern[0] == ' ' || *pattern.rbegin() == ' ')) if (!pattern.empty() && (pattern[0] == ' ' || *pattern.rbegin() == ' '))
extraWhitespaceError(tok, pattern, funcname); extraWhitespaceError(tok, pattern, funcname);