From 6f9730b1d88974c8705cfc572560923f8b4e53a7 Mon Sep 17 00:00:00 2001
From: Dmitry-Me <wipedout@yandex.ru>
Date: Tue, 16 Sep 2014 10:17:06 +0400
Subject: [PATCH] Reorder checks, unwrap code

---
 lib/valueflow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index e8573eab9..8d62349dd 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -1233,7 +1233,7 @@ static bool valueFlowForLoop1(const Token *tok, unsigned int * const varid, Math
     tok = tok->tokAt(2);
     if (!Token::Match(tok,"%type%| %var% ="))
         return false;
-    const Token * const vartok = tok->tokAt(Token::Match(tok, "%var% =") ? 0 : 1);
+    const Token * const vartok = Token::Match(tok, "%var% =") ? tok : tok->next();
     if (vartok->varId() == 0U)
         return false;
     *varid = vartok->varId();
@@ -1492,7 +1492,7 @@ static void valueFlowSubFunction(TokenList *tokenlist, ErrorLogger *errorLogger,
             std::list<ValueFlow::Value> argvalues;
 
             // passing value(s) to function
-            if (Token::Match(argtok, "%var%|%num%|%str% [,)]") && !argtok->values.empty())
+            if (!argtok->values.empty() && Token::Match(argtok, "%var%|%num%|%str% [,)]"))
                 argvalues = argtok->values;
             else {
                 // bool operator => values 1/0 are passed to function..