fixup! fixup! fixup! fixup! Fix #958: warn when feof() is used as a while loop condition

Author: francois-berder

lib/checkio.cpp

@@ -488,11 +488,10 @@ static bool findFileReadCall(const Token *start, const Token *end, int varid)
     if (args.empty())
         return false;
 
-    if (found->str() == "fscanf") {
+    if (found->str() == "fscanf")
         return args.front()->varId() == varid;
-    } else {
-        return args.back()->varId() == varid;
-    }
+
+    return args.back()->varId() == varid;
 }
 
 void CheckIO::checkWrongfeofUsage()
@@ -503,7 +502,7 @@ void CheckIO::checkWrongfeofUsage()
 
     for (const Scope * scope : symbolDatabase->functionScopes) {
         for (const Token *tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
-            if (!Token::Match(tok, "while ( ! feof ("))
+            if (!Token::simpleMatch(tok, "while ( ! feof ("))
                 continue;
 
             // Usage of feof is correct if a read happens before and within the loop