remove always true if statements

Author: samopolacek

lib/cppcheck.cpp

@@ -561,19 +561,17 @@ unsigned int CppCheck::check(const std::string &path)
             fdump.exceptions(std::ios_base::failbit | std::ios_base::badbit);
             std::string dumpFile;
             createDumpFile(mSettings, path, fdump, dumpFile);
-            if (fdump.is_open()) {
-                fdump << "<dump cfg=\"\">" << std::endl;
-                for (const ErrorMessage& errmsg: compilerWarnings)
-                    fdump << "  <clang-warning file=\"" << toxml(errmsg.callStack.front().getfile()) << "\" line=\"" << errmsg.callStack.front().line << "\" column=\"" << errmsg.callStack.front().column << "\" message=\"" << toxml(errmsg.shortMessage()) << "\"/>\n";
-                fdump << "  <standards>" << std::endl;
-                fdump << "    <c version=\"" << mSettings.standards.getC() << "\"/>" << std::endl;
-                fdump << "    <cpp version=\"" << mSettings.standards.getCPP() << "\"/>" << std::endl;
-                fdump << "  </standards>" << std::endl;
-                tokenizer.dump(fdump);
-                fdump << "</dump>" << std::endl;
-                fdump << "</dumps>" << std::endl;
-                fdump.close();
-            }
+            fdump << "<dump cfg=\"\">" << std::endl;
+            for (const ErrorMessage& errmsg: compilerWarnings)
+                fdump << "  <clang-warning file=\"" << toxml(errmsg.callStack.front().getfile()) << "\" line=\"" << errmsg.callStack.front().line << "\" column=\"" << errmsg.callStack.front().column << "\" message=\"" << toxml(errmsg.shortMessage()) << "\"/>\n";
+            fdump << "  <standards>" << std::endl;
+            fdump << "    <c version=\"" << mSettings.standards.getC() << "\"/>" << std::endl;
+            fdump << "    <cpp version=\"" << mSettings.standards.getCPP() << "\"/>" << std::endl;
+            fdump << "  </standards>" << std::endl;
+            tokenizer.dump(fdump);
+            fdump << "</dump>" << std::endl;
+            fdump << "</dumps>" << std::endl;
+            fdump.close();
 
             // run addons
             executeAddons(dumpFile);
@@ -780,10 +778,8 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
         fdump.exceptions(std::ios_base::failbit | std::ios_base::badbit);
         std::string dumpFile;
         createDumpFile(mSettings, filename, fdump, dumpFile);
-        if (fdump.is_open()) {
-            fdump << dumpProlog.str();
-            dumpProlog.str("");
-        }
+        fdump << dumpProlog.str();
+        dumpProlog.str("");
 
         // Get directives
         preprocessor.setDirectives(tokens1);

tools/dmake.cpp

@@ -397,26 +397,25 @@ int main(int argc, char **argv)
     {
         std::ofstream fout1("lib/lib.pri");
         fout1.exceptions(std::ios_base::failbit | std::ios_base::badbit);
-        if (fout1.is_open()) {
-            fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
-            fout1 << "include($$PWD/pcrerules.pri)\n";
-            fout1 << "include($$PWD/../externals/externals.pri)\n";
-            fout1 << "INCLUDEPATH += $$PWD\n";
-            fout1 << "HEADERS += ";
-            for (const std::string &libfile_h : libfiles_h) {
-                fout1 << "$${PWD}/" << libfile_h;
-                if (libfile_h != libfiles_h.back())
-                    fout1 << " \\\n" << std::string(11, ' ');
-            }
-            fout1 << "\n\nSOURCES += ";
-            for (const std::string &libfile : libfiles) {
-                fout1 << "$${PWD}/" << libfile.substr(4);
-                if (libfile != libfiles.back())
-                    fout1 << " \\\n" << std::string(11, ' ');
-            }
-            fout1 << "\n";
+
+        fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
+        fout1 << "include($$PWD/pcrerules.pri)\n";
+        fout1 << "include($$PWD/../externals/externals.pri)\n";
+        fout1 << "INCLUDEPATH += $$PWD\n";
+        fout1 << "HEADERS += ";
+        for (const std::string &libfile_h : libfiles_h) {
+            fout1 << "$${PWD}/" << libfile_h;
+            if (libfile_h != libfiles_h.back())
+                fout1 << " \\\n" << std::string(11, ' ');
         }
-    }
+        fout1 << "\n\nSOURCES += ";
+        for (const std::string &libfile : libfiles) {
+            fout1 << "$${PWD}/" << libfile.substr(4);
+            if (libfile != libfiles.back())
+                fout1 << " \\\n" << std::string(11, ' ');
+        }
+        fout1 << "\n";
+}
 
     static const char makefile[] = "Makefile";
     std::ofstream fout(makefile, std::ios_base::trunc);