daca: update WRONG_DATA interface

danmar · danmar · commit 0e32e19184f4 · 2020-10-03T15:36:02.000+02:00
diff --git a/lib/check.cpp b/lib/check.cpp
@@ -64,17 +64,11 @@ void Check::reportError(const ErrorPath &errorPath, Severity::SeverityType sever
         reportError(errmsg);
 }
 
-bool Check::wrongData(const Token *tok, bool condition, const char *str)
+bool Check::wrongData(const Token *tok, const char *str)
 {
-#if defined(DACA2) || defined(UNSTABLE)
-    if (condition) {
+    if (mSettings->daca)
         reportError(tok, Severity::debug, "DacaWrongData", "Wrong data detected by condition " + std::string(str));
-    }
-#else
-    (void)tok;
-    (void)str;
-#endif
-    return condition;
+    return true;
 }
 
 std::list<Check *> &Check::instances()
@@ -115,4 +109,4 @@ ErrorPath Check::getErrorPath(const Token* errtok, const ValueFlow::Value* value
         errorPath.emplace_back(errtok, bug);
     }
     return errorPath;
-}
+}
diff --git a/lib/check.h b/lib/check.h
@@ -46,7 +46,7 @@ class ErrorMessage;
 class Tokenizer;
 
 /** Use WRONG_DATA in checkers to mark conditions that check that data is correct */
-#define WRONG_DATA(COND, TOK)  (wrongData((TOK), (COND), #COND))
+#define WRONG_DATA(COND, TOK)  ((COND) && wrongData((TOK), #COND))
 
 /// @addtogroup Core
 /// @{
@@ -158,7 +158,7 @@ class CPPCHECKLIB Check {
      * Use WRONG_DATA in checkers when you check for wrong data. That
      * will call this method
      */
-    bool wrongData(const Token *tok, bool condition, const char *str);
+    bool wrongData(const Token *tok, const char *str);
 
     /** disabled assignment operator and copy constructor */
     void operator=(const Check &) = delete;

Original file line number	Diff line number	Diff line change
`@@ -64,17 +64,11 @@ void Check::reportError(const ErrorPath &errorPath, Severity::SeverityType sever`
`64`	`64`	`reportError(errmsg);`
`65`	`65`	`}`
`66`	`66`
`67`		`-bool Check::wrongData(const Token tok, bool condition, const char str)`
	`67`	`+bool Check::wrongData(const Token tok, const char str)`
`68`	`68`	`{`
`69`		`-#if defined(DACA2) \|\| defined(UNSTABLE)`
`70`		`- if (condition) {`
	`69`	`+ if (mSettings->daca)`
`71`	`70`	`reportError(tok, Severity::debug, "DacaWrongData", "Wrong data detected by condition " + std::string(str));`
`72`		`- }`
`73`		`-#else`
`74`		`- (void)tok;`
`75`		`- (void)str;`
`76`		`-#endif`
`77`		`- return condition;`
	`71`	`+ return true;`
`78`	`72`	`}`
`79`	`73`
`80`	`74`	`std::list<Check *> &Check::instances()`
`@@ -115,4 +109,4 @@ ErrorPath Check::getErrorPath(const Token* errtok, const ValueFlow::Value* value`
`115`	`109`	`errorPath.emplace_back(errtok, bug);`
`116`	`110`	`}`
`117`	`111`	`return errorPath;`
`118`		`-}`
	`112`	`+}`