got rid of output setters in SEH/signal code

danmar · Oct 7, 2024 · 5b0a81f · 5b0a81f
1 parent 25130ff
commit 5b0a81f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 33 deletions.
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -188,13 +188,6 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
         return EXIT_SUCCESS;
     }
 
-    #if defined(USE_WINDOWS_SEH)
-        set_seh_output(settings.exceptionOutput);
-    #endif
-    #if defined(USE_UNIX_SIGNAL_HANDLING)
-        set_signal_handler_output(settings.exceptionOutput);
-    #endif
-
     settings.loadSummaries();
 
     mFiles = parser.getFiles();
@@ -214,7 +207,7 @@ int CppCheckExecutor::check_wrapper(const Settings& settings)
         return check_wrapper_seh(*this, &CppCheckExecutor::check_internal, settings);
 #elif defined(USE_UNIX_SIGNAL_HANDLING)
     if (settings.exceptionHandling)
-        register_signal_handler();
+        register_signal_handler(settings.exceptionOutput);
 #endif
     return check_internal(settings);
 }

diff --git a/cli/cppcheckexecutorseh.cpp b/cli/cppcheckexecutorseh.cpp
@@ -252,13 +252,6 @@ namespace {
     }
 }
 
-static FILE* sehOutput = stdout;
-
-void set_seh_output(FILE* f)
-{
-    sehOutput = f;
-}
-
 /**
  * Signal/SEH handling
  * Has to be clean for using with SEH on windows, i.e. no construction of C++ object instances is allowed!
@@ -267,7 +260,7 @@ void set_seh_output(FILE* f)
  */
 int check_wrapper_seh(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(const Settings&) const, const Settings& settings)
 {
-    FILE *outputFile = sehOutput;
+    FILE * const outputFile = settings.exceptionOutput;
     __try {
         return (&executor->*f)(settings);
     } __except (filterException(outputFile, GetExceptionCode(), GetExceptionInformation())) {

diff --git a/cli/cppcheckexecutorseh.h b/cli/cppcheckexecutorseh.h
@@ -26,8 +26,6 @@
 class CppCheckExecutor;
 class Settings;
 
-void set_seh_output(FILE* f);
-
 int check_wrapper_seh(CppCheckExecutor& executor, int (CppCheckExecutor::*f)(const Settings&) const, const Settings& settings);
 
 #endif

diff --git a/cli/signalhandler.cpp b/cli/signalhandler.cpp
@@ -56,12 +56,7 @@ static constexpr size_t MYSTACKSIZE = 16*1024+SIGSTKSZ; // wild guess about a re
 #endif
 static char mytstack[MYSTACKSIZE]= {0}; // alternative stack for signal handler
 static bool bStackBelowHeap=false; // lame attempt to locate heap vs. stack address space. See CppCheckExecutor::check_wrapper()
-static FILE* signalOutput = stdout;
-
-void set_signal_handler_output(FILE* f)
-{
-    signalOutput = f;
-}
+static FILE* signalOutput = stdout; // TODO: get rid of this
 
 /**
  * \param[in] ptr address to be examined.
@@ -299,9 +294,9 @@ static void CppcheckSignalHandler(int signo, siginfo_t * info, void * context)
     }
 }
 
-void register_signal_handler()
+void register_signal_handler(FILE * const output)
 {
-    FILE * const output = signalOutput;
+    signalOutput = output;
 
     // determine stack vs. heap
     char stackVariable;

diff --git a/cli/signalhandler.h b/cli/signalhandler.h
@@ -25,12 +25,7 @@
 
 #include <cstdio>
 
-/**
- * @param f Output file
- */
-void set_signal_handler_output(FILE* f);
-
-void register_signal_handler();
+void register_signal_handler(FILE* output);
 
 #endif // USE_UNIX_SIGNAL_HANDLING
 

diff --git a/test/signal/test-signalhandler.cpp b/test/signal/test-signalhandler.cpp
@@ -60,7 +60,7 @@ int main(int argc, const char * const argv[])
     if (argc != 2)
         return 1;
 
-    register_signal_handler();
+    register_signal_handler(stdout);
 
     if (strcmp(argv[1], "assert") == 0)
         my_assert();