Merge pull request cppcheck-opensource#780 from Dmitry-Me/reduceVariableScope5

Dmitry-Me · Dmitry-Me · commit 180e46ff2174 · 2016-03-03T07:57:51.000+03:00
Reduce variable lifetime
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -970,14 +970,14 @@ static void valueFlowBeforeCondition(TokenList *tokenlist, SymbolDatabase *symbo
                 continue;
 
             // extra logic for unsigned variables 'i>=1' => possible value can also be 0
-            ValueFlow::Value val(tok, num);
-            val.varId = varid;
             if (Token::Match(tok, "<|>")) {
                 if (num != 0)
                     continue;
                 if (!var->typeStartToken()->isUnsigned())
                     continue;
             }
+            ValueFlow::Value val(tok, num);
+            val.varId = varid;
             ValueFlow::Value val2;
             if (num==1U && Token::Match(tok,"<=|>=")) {
                 if (var->typeStartToken()->isUnsigned()) {
