From 84194cf5efa325cef9d93429db2daf5feb2045cc Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Mon, 3 Mar 2025 11:53:24 +0000 Subject: [PATCH] chore: Use default init instead of ctor init Windows watchdog --- src/lib/platform/MSWindowsWatchdog.cpp | 9 +-------- src/lib/platform/MSWindowsWatchdog.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/lib/platform/MSWindowsWatchdog.cpp b/src/lib/platform/MSWindowsWatchdog.cpp index fa0e437c8..abf52279c 100644 --- a/src/lib/platform/MSWindowsWatchdog.cpp +++ b/src/lib/platform/MSWindowsWatchdog.cpp @@ -26,14 +26,7 @@ const auto kStartDelaySeconds = 1; const auto kOutputBufferSize = 4096; -MSWindowsWatchdog::MSWindowsWatchdog(bool foreground) - : m_thread(nullptr), - m_outputWritePipe(nullptr), - m_outputReadPipe(nullptr), - m_elevateProcess(false), - m_startFailures(0), - m_fileLogOutputter(nullptr), - m_foreground(foreground) +MSWindowsWatchdog::MSWindowsWatchdog(bool foreground) : m_foreground(foreground) { initSasFunc(); initOutputReadPipe(); diff --git a/src/lib/platform/MSWindowsWatchdog.h b/src/lib/platform/MSWindowsWatchdog.h index c974c73c5..985360e27 100644 --- a/src/lib/platform/MSWindowsWatchdog.h +++ b/src/lib/platform/MSWindowsWatchdog.h @@ -68,15 +68,15 @@ private: static std::string processStateToString(ProcessState state); private: - Thread *m_thread; - bool m_running; - HANDLE m_outputWritePipe; - HANDLE m_outputReadPipe; - Thread *m_outputThread; - bool m_elevateProcess; + Thread *m_thread = nullptr; + bool m_running = true; + HANDLE m_outputWritePipe = nullptr; + HANDLE m_outputReadPipe = nullptr; + Thread *m_outputThread = nullptr; + bool m_elevateProcess = false; MSWindowsSession m_session; - int m_startFailures; - FileLogOutputter *m_fileLogOutputter; + int m_startFailures = 0; + FileLogOutputter *m_fileLogOutputter = nullptr; bool m_foreground; std::string m_activeDesktop; std::unique_ptr m_process;