Travis: Fixed cppcheck style warning

danmar · danmar · commit 6900d4fb7602 · 2013-06-09T20:17:26.000+02:00
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -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)tokenlist;
+     (void)tokenizer;
+
+#ifdef HAVE_RULES
     // Are there rules to execute?
     bool isrule = false;
     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)
             continue;
 
-#ifdef HAVE_RULES
         const char *error = 0;
         int erroffset = 0;
         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);
-#endif
     }
+#endif
 }
 
 Settings &CppCheck::settings()

Original file line number	Diff line number	Diff line change
`@@ -402,6 +402,10 @@ void CppCheck::checkFile(const std::string &code, const char FileName[])`
`402`	`402`
`403`	`403`	`void CppCheck::executeRules(const std::string &tokenlist, const Tokenizer &tokenizer)`
`404`	`404`	`{`
	`405`	`+ (void)tokenlist;`
	`406`	`+ (void)tokenizer;`
	`407`	`+`
	`408`	`+#ifdef HAVE_RULES`
`405`	`409`	`// Are there rules to execute?`
`406`	`410`	`bool isrule = false;`
`407`	`411`	`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`
`424`	`428`	`if (rule.pattern.empty() \|\| rule.id.empty() \|\| rule.severity.empty() \|\| rule.tokenlist != tokenlist)`
`425`	`429`	`continue;`
`426`	`430`
`427`		`-#ifdef HAVE_RULES`
`428`	`431`	`const char *error = 0;`
`429`	`432`	`int erroffset = 0;`
`430`	`433`	`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`
`480`	`483`	`}`
`481`	`484`
`482`	`485`	`pcre_free(re);`
`483`		`-#endif`
`484`	`486`	`}`
	`487`	`+#endif`
`485`	`488`	`}`
`486`	`489`
`487`	`490`	`Settings &CppCheck::settings()`