CppCheckExecutor: moved CppCheck instance into check_internal()

cli/cppcheckexecutor.cpp

@@ -195,26 +195,23 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
 
     mStdLogger = new StdLogger(settings);
 
-    CppCheck cppCheck(*mStdLogger, true, executeCommand);
-    cppCheck.settings() = settings; // this is a copy
-
-    const int ret = check_wrapper(cppCheck);
+    const int ret = check_wrapper(settings);
 
     delete mStdLogger;
     mStdLogger = nullptr;
     return ret;
 }
 
-int CppCheckExecutor::check_wrapper(CppCheck& cppcheck)
+int CppCheckExecutor::check_wrapper(const Settings& settings)
 {
 #ifdef USE_WINDOWS_SEH
-    if (cppcheck.settings().exceptionHandling)
-        return check_wrapper_seh(*this, &CppCheckExecutor::check_internal, cppcheck);
+    if (settings.exceptionHandling)
+        return check_wrapper_seh(*this, &CppCheckExecutor::check_internal, settings);
 #elif defined(USE_UNIX_SIGNAL_HANDLING)
-    if (cppcheck.settings().exceptionHandling)
-        return check_wrapper_sig(*this, &CppCheckExecutor::check_internal, cppcheck);
+    if (settings.exceptionHandling)
+        return check_wrapper_sig(*this, &CppCheckExecutor::check_internal, settings);
 #endif
-    return check_internal(cppcheck);
+    return check_internal(settings);
 }
 
 bool CppCheckExecutor::reportSuppressions(const Settings &settings, const Suppressions& suppressions, bool unusedFunctionCheckEnabled, const std::list<std::pair<std::string, std::size_t>> &files, const std::list<FileSettings>& fileSettings, ErrorLogger& errorLogger) {
@@ -246,9 +243,11 @@ bool CppCheckExecutor::reportSuppressions(const Settings &settings, const Suppre
 /*
  * That is a method which gets called from check_wrapper
  * */
-int CppCheckExecutor::check_internal(CppCheck& cppcheck) const
+int CppCheckExecutor::check_internal(const Settings& settings) const
 {
-    const auto& settings = cppcheck.settings();
+    CppCheck cppcheck(*mStdLogger, true, executeCommand);
+    cppcheck.settings() = settings; // this is a copy
+
     auto& suppressions = cppcheck.settings().nomsg;
 
     if (settings.reportProgress >= 0)
@@ -285,7 +284,7 @@ int CppCheckExecutor::check_internal(CppCheck& cppcheck) const
     cppcheck.analyseWholeProgram(settings.buildDir, mFiles, mFileSettings);
 
     if (settings.severity.isEnabled(Severity::information) || settings.checkConfiguration) {
-        const bool err = reportSuppressions(settings, settings.nomsg, cppcheck.isUnusedFunctionCheckEnabled(), mFiles, mFileSettings, *mStdLogger);
+        const bool err = reportSuppressions(settings, suppressions, cppcheck.isUnusedFunctionCheckEnabled(), mFiles, mFileSettings, *mStdLogger);
         if (err && returnValue == 0)
             returnValue = settings.exitCode;
     }

cli/cppcheckexecutor.h

@@ -28,7 +28,6 @@
 #include <utility>
 #include <vector>
 
-class CppCheck;
 class Settings;
 class ErrorLogger;
 class Suppressions;
@@ -88,21 +87,21 @@ class CppCheckExecutor {
      * Wrapper around check_internal
      *   - installs optional platform dependent signal handling
      *
-     * @param cppcheck cppcheck instance
+     * @param settings the settings
      **/
-    int check_wrapper(CppCheck& cppcheck);
+    int check_wrapper(const Settings& settings);
 
     /**
      * Starts the checking.
      *
-     * @param cppcheck cppcheck instance
+     * @param settings the settings
      * @return EXIT_FAILURE if arguments are invalid or no input files
      *         were found.
      *         If errors are found and --error-exitcode is used,
      *         given value is returned instead of default 0.
      *         If no errors are found, 0 is returned.
      */
-    int check_internal(CppCheck& cppcheck) const;
+    int check_internal(const Settings& settings) const;
 
     /**
      * Filename associated with size of file

cli/cppcheckexecutorseh.cpp

@@ -253,11 +253,11 @@ namespace {
  * TODO Check for multi-threading issues!
  *
  */
-int check_wrapper_seh(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(CppCheck&) const, CppCheck& cppcheck)
+int check_wrapper_seh(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(const Settings&) const, const Settings& settings)
 {
     FILE *outputFile = CppCheckExecutor::getExceptionOutput();
     __try {
-        return (&executor->*f)(cppcheck);
+        return (&executor->*f)(settings);
     } __except (filterException(outputFile, GetExceptionCode(), GetExceptionInformation())) {
         fputs("Please report this to the cppcheck developers!\n", outputFile);
         return -1;

cli/cppcheckexecutorseh.h

@@ -24,9 +24,9 @@
 #ifdef USE_WINDOWS_SEH
 
 class CppCheckExecutor;
-class CppCheck;
+class Settings;
 
-int check_wrapper_seh(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(CppCheck&) const, CppCheck& cppcheck);
+int check_wrapper_seh(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(const Settings&) const, const Settings& settings);
 
 #endif
 

cli/cppcheckexecutorsig.cpp

@@ -298,7 +298,7 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
     }
 }
 
-int check_wrapper_sig(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(CppCheck&) const, CppCheck& cppcheck)
+int check_wrapper_sig(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(const Settings&) const, const Settings& settings)
 {
     // determine stack vs. heap
     char stackVariable;
@@ -321,7 +321,7 @@ int check_wrapper_sig(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(Cpp
     for (std::map<int, std::string>::const_iterator sig=listofsignals.cbegin(); sig!=listofsignals.cend(); ++sig) {
         sigaction(sig->first, &act, nullptr);
     }
-    return (executor.*f)(cppcheck);
+    return (executor.*f)(settings);
 }
 
 #endif

cli/cppcheckexecutorsig.h

@@ -24,9 +24,9 @@
 #if defined(USE_UNIX_SIGNAL_HANDLING)
 
 class CppCheckExecutor;
-class CppCheck;
+class Settings;
 
-int check_wrapper_sig(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(CppCheck&) const, CppCheck& cppcheck);
+int check_wrapper_sig(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(const Settings&) const, const Settings& settings);
 
 #endif // CPPCHECKEXECUTORSIG_H