Make patterns compilable (mini refactoring)

thomasjfox · thomasjfox · commit 332254e0af4e · 2015-01-09T23:43:45.000+01:00
diff --git a/lib/checkbool.cpp b/lib/checkbool.cpp
@@ -402,9 +402,13 @@ void CheckBool::checkComparisonOfBoolExpressionWithInt()
                 continue;
 
             if (numTok->isNumber()) {
-                if (numTok->str() == "0" && Token::Match(tok, numInRhs ? ">|==|!=" : "<|==|!="))
+                if (numTok->str() == "0" &&
+                    (numInRhs ? Token::Match(tok, ">|==|!=")
+                     : Token::Match(tok, "<|==|!=")))
                     continue;
-                if (numTok->str() == "1" && Token::Match(tok, numInRhs ? "<|==|!=" : ">|==|!="))
+                if (numTok->str() == "1" &&
+                    (numInRhs ? Token::Match(tok, "<|==|!=")
+                     : Token::Match(tok, ">|==|!=")))
                     continue;
                 comparisonOfBoolExpressionWithIntError(tok, true);
             } else if (isNonBoolStdType(numTok->variable()))
diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp
@@ -458,12 +458,11 @@ void CheckNullPointer::removeAssignedVarFromSet(const Token* tok, std::set<unsig
 {
     // If a pointer's address is passed into a function, stop considering it
     if (Token::Match(tok->previous(), "[;{}] %var% (")) {
-        // Common functions that are known NOT to modify their pointer argument
-        const char safeFunctions[] = "printf|sprintf|fprintf|vprintf";
-
         const Token* endParen = tok->next()->link();
         for (const Token* tok2 = tok->next(); tok2 != endParen; tok2 = tok2->next()) {
-            if (tok2->isName() && tok2->varId() > 0 && !Token::Match(tok, safeFunctions)) {
+            if (tok2->isName() && tok2->varId() > 0
+                // Common functions that are known NOT to modify their pointer argument
+                && !Token::Match(tok, "printf|sprintf|fprintf|vprintf")) {
                 pointerArgs.erase(tok2->varId());
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -458,12 +458,11 @@ void CheckNullPointer::removeAssignedVarFromSet(const Token* tok, std::set<unsig`
`458`	`458`	`{`
`459`	`459`	`// If a pointer's address is passed into a function, stop considering it`
`460`	`460`	`if (Token::Match(tok->previous(), "[;{}] %var% (")) {`
`461`		`- // Common functions that are known NOT to modify their pointer argument`
`462`		`- const char safeFunctions[] = "printf\|sprintf\|fprintf\|vprintf";`
`463`		`-`
`464`	`461`	`const Token* endParen = tok->next()->link();`
`465`	`462`	`for (const Token* tok2 = tok->next(); tok2 != endParen; tok2 = tok2->next()) {`
`466`		`- if (tok2->isName() && tok2->varId() > 0 && !Token::Match(tok, safeFunctions)) {`
	`463`	`+ if (tok2->isName() && tok2->varId() > 0`
	`464`	`+ // Common functions that are known NOT to modify their pointer argument`
	`465`	`+ && !Token::Match(tok, "printf\|sprintf\|fprintf\|vprintf")) {`
`467`	`466`	`pointerArgs.erase(tok2->varId());`
`468`	`467`	`}`
`469`	`468`	`}`