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

Travis: Fixed cppcheck style warning

This commit is contained in:
Daniel Marjamäki 2013-06-09 20:17:26 +02:00
parent 4e816e2edf
commit 6900d4fb76
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/cppcheck.cpp
View File

@ -402,6 +402,10 @@ void CppCheck::checkFile(const std::string &code, const char FileName[])
void CppCheck::executeRules(const std::string &tokenlist, const Tokenizer &tokenizer) void CppCheck::executeRules(const std::string &tokenlist, const Tokenizer &tokenizer)
{ {
(void)tokenlist;
(void)tokenizer;
#ifdef HAVE_RULES
// Are there rules to execute? // Are there rules to execute?
bool isrule = false; bool isrule = false;
for (std::list<Settings::Rule>::const_iterator it = _settings.rules.begin(); it != _settings.rules.end(); ++it) { for (std::list<Settings::Rule>::const_iterator it = _settings.rules.begin(); it != _settings.rules.end(); ++it) {
@ -424,7 +428,6 @@ void CppCheck::executeRules(const std::string &tokenlist, const Tokenizer &token
if (rule.pattern.empty() || rule.id.empty() || rule.severity.empty() || rule.tokenlist != tokenlist) if (rule.pattern.empty() || rule.id.empty() || rule.severity.empty() || rule.tokenlist != tokenlist)
continue; continue;
#ifdef HAVE_RULES
const char *error = 0; const char *error = 0;
int erroffset = 0; int erroffset = 0;
pcre *re = pcre_compile(rule.pattern.c_str(),0,&error,&erroffset,NULL); pcre *re = pcre_compile(rule.pattern.c_str(),0,&error,&erroffset,NULL);
@ -480,8 +483,8 @@ void CppCheck::executeRules(const std::string &tokenlist, const Tokenizer &token
} }
pcre_free(re); pcre_free(re);
#endif
} }
#endif
} }
Settings &CppCheck::settings() Settings &CppCheck::settings()