diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp index 6c8b8b50..cd2c9a8d 100644 --- a/modules/adminlog.cpp +++ b/modules/adminlog.cpp @@ -198,7 +198,7 @@ private: LOG_TO_SYSLOG = 1 << 1, LOG_TO_BOTH = LOG_TO_FILE | LOG_TO_SYSLOG }; - LogMode m_eLogMode; + LogMode m_eLogMode = LOG_TO_FILE; CString m_sLogFile; }; diff --git a/modules/clientnotify.cpp b/modules/clientnotify.cpp index ca999b10..0198b896 100644 --- a/modules/clientnotify.cpp +++ b/modules/clientnotify.cpp @@ -22,8 +22,8 @@ using std::set; class CClientNotifyMod : public CModule { protected: CString m_sMethod; - bool m_bNewOnly; - bool m_bOnDisconnect; + bool m_bNewOnly{}; + bool m_bOnDisconnect{}; set m_sClientsSeen; diff --git a/modules/ctcpflood.cpp b/modules/ctcpflood.cpp index c105ef73..d64018ef 100644 --- a/modules/ctcpflood.cpp +++ b/modules/ctcpflood.cpp @@ -21,9 +21,6 @@ class CCtcpFloodMod : public CModule { public: MODCONSTRUCTOR(CCtcpFloodMod) { - m_tLastCTCP = 0; - m_iNumCTCP = 0; - AddHelpCommand(); AddCommand("Secs", static_cast(&CCtcpFloodMod::OnSecsCommand), "", "Set seconds limit"); AddCommand("Lines", static_cast(&CCtcpFloodMod::OnLinesCommand), "", "Set lines limit"); @@ -131,11 +128,11 @@ public: } private: - time_t m_tLastCTCP; - unsigned int m_iNumCTCP; + time_t m_tLastCTCP = 0; + unsigned int m_iNumCTCP = 0; - time_t m_iThresholdSecs; - unsigned int m_iThresholdMsgs; + time_t m_iThresholdSecs{}; + unsigned int m_iThresholdMsgs{}; }; template<> void TModInfo(CModInfo& Info) { diff --git a/modules/cyrusauth.cpp b/modules/cyrusauth.cpp index 6595fe5e..d94fe756 100644 --- a/modules/cyrusauth.cpp +++ b/modules/cyrusauth.cpp @@ -31,6 +31,13 @@ public: MODCONSTRUCTOR(CSASLAuthMod) { m_Cache.SetTTL(60000/*ms*/); + m_cbs[0].id = SASL_CB_GETOPT; + m_cbs[0].proc = reinterpret_cast(CSASLAuthMod::getopt); + m_cbs[0].context = this; + m_cbs[1].id = SASL_CB_LIST_END; + m_cbs[1].proc = nullptr; + m_cbs[1].context = nullptr; + AddHelpCommand(); AddCommand("CreateUser", static_cast(&CSASLAuthMod::CreateUserCommand), "[yes|no]"); @@ -77,13 +84,6 @@ public: return false; } - m_cbs[0].id = SASL_CB_GETOPT; - m_cbs[0].proc = reinterpret_cast(CSASLAuthMod::getopt); - m_cbs[0].context = this; - m_cbs[1].id = SASL_CB_LIST_END; - m_cbs[1].proc = nullptr; - m_cbs[1].context = nullptr; - return true; } diff --git a/modules/fail2ban.cpp b/modules/fail2ban.cpp index ee10c048..ce65b06f 100644 --- a/modules/fail2ban.cpp +++ b/modules/fail2ban.cpp @@ -196,7 +196,7 @@ public: private: TCacheMap m_Cache; - unsigned int m_uiAllowedFailed; + unsigned int m_uiAllowedFailed{}; }; template<> void TModInfo(CModInfo& Info) { diff --git a/modules/keepnick.cpp b/modules/keepnick.cpp index 8bd1c0d3..b943bb40 100644 --- a/modules/keepnick.cpp +++ b/modules/keepnick.cpp @@ -192,7 +192,7 @@ public: private: // If this is nullptr, we are turned off for some reason - CKeepNickTimer* m_pTimer; + CKeepNickTimer* m_pTimer = nullptr; }; CKeepNickTimer::CKeepNickTimer(CKeepNickMod *pMod) : CTimer(pMod, 30, 0, diff --git a/modules/kickrejoin.cpp b/modules/kickrejoin.cpp index 4741a53f..95a210ae 100644 --- a/modules/kickrejoin.cpp +++ b/modules/kickrejoin.cpp @@ -47,7 +47,7 @@ protected: class CRejoinMod : public CModule { private: - unsigned int delay; + unsigned int delay = 10; public: MODCONSTRUCTOR(CRejoinMod) { diff --git a/modules/notes.cpp b/modules/notes.cpp index 10c33ec8..0192e09a 100644 --- a/modules/notes.cpp +++ b/modules/notes.cpp @@ -19,7 +19,7 @@ using std::stringstream; class CNotesMod : public CModule { - bool bShowNotesOnLogin; + bool m_bShowNotesOnLogin{}; void ListCommand(const CString &sLine) { ListNotes(); @@ -85,14 +85,14 @@ public: virtual ~CNotesMod() {} bool OnLoad(const CString& sArgs, CString& sMessage) override { - bShowNotesOnLogin = !sArgs.Equals("-disableNotesOnLogin"); + m_bShowNotesOnLogin = !sArgs.Equals("-disableNotesOnLogin"); return true; } CString GetWebMenuTitle() override { return "Notes"; } void OnClientLogin() override { - if (bShowNotesOnLogin) { + if (m_bShowNotesOnLogin) { ListNotes(true); } } diff --git a/modules/q.cpp b/modules/q.cpp index edb16dca..32a4091d 100644 --- a/modules/q.cpp +++ b/modules/q.cpp @@ -372,11 +372,11 @@ public: } private: - bool m_bCloaked; - bool m_bAuthed; - bool m_bRequestedWhoami; - bool m_bRequestedChallenge; - bool m_bCatchResponse; + bool m_bCloaked{}; + bool m_bAuthed{}; + bool m_bRequestedWhoami{}; + bool m_bRequestedChallenge{}; + bool m_bCatchResponse{}; MCString m_msChanModes; void PutQ(const CString& sMessage) { @@ -590,11 +590,11 @@ private: /* Settings */ CString m_sUsername; CString m_sPassword; - bool m_bUseCloakedHost; - bool m_bUseChallenge; - bool m_bRequestPerms; - bool m_bJoinOnInvite; - bool m_bJoinAfterCloaked; + bool m_bUseCloakedHost{}; + bool m_bUseChallenge{}; + bool m_bRequestPerms{}; + bool m_bJoinOnInvite{}; + bool m_bJoinAfterCloaked{}; void SetUsername(const CString& sUsername) { m_sUsername = sUsername; diff --git a/modules/sasl.cpp b/modules/sasl.cpp index 557d2fcd..b7a5af90 100644 --- a/modules/sasl.cpp +++ b/modules/sasl.cpp @@ -61,7 +61,7 @@ public: } private: - unsigned int m_uiIndex; + unsigned int m_uiIndex = 0; }; class CSASLMod : public CModule { diff --git a/src/IRCNetwork.cpp b/src/IRCNetwork.cpp index 91ce49a2..637ee85a 100644 --- a/src/IRCNetwork.cpp +++ b/src/IRCNetwork.cpp @@ -475,6 +475,7 @@ bool CIRCNetwork::ParseConfig(CConfig *pConfig, CString& sError, bool bUpgrade) CUtils::PrintError(sError); CZNC::DumpConfig(pSubConf); + delete pChan; return false; }