From 13a556df891756a195b2f432e4187103ce4043af Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 14 Mar 2024 23:19:32 +0000 Subject: [PATCH] Initialize timer members with constructor initialization. --- include/timers.h | 2 +- src/timers.cpp | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/include/timers.h b/include/timers.h index 6233eb2d8..3615074df 100644 --- a/include/timers.h +++ b/include/timers.h @@ -18,7 +18,7 @@ class CoreExport Timer private: /** The owner of the timer, if any */ - Module *owner; + Module *owner = nullptr; /** The triggering time */ diff --git a/src/timers.cpp b/src/timers.cpp index fed5d6396..d9164bda7 100644 --- a/src/timers.cpp +++ b/src/timers.cpp @@ -12,22 +12,19 @@ std::multimap TimerManager::Timers; Timer::Timer(time_t time_from_now, bool repeating) + : trigger(Anope::CurTime + std::abs(time_from_now)) + , secs(time_from_now) + , repeat(repeating) { - owner = NULL; - trigger = Anope::CurTime + std::abs(time_from_now); - secs = time_from_now; - repeat = repeating; - TimerManager::AddTimer(this); } Timer::Timer(Module *creator, time_t time_from_now, bool repeating) + : owner(creator) + , trigger(Anope::CurTime + std::abs(time_from_now)) + , secs(time_from_now) + , repeat(repeating) { - owner = creator; - trigger = Anope::CurTime + std::abs(time_from_now); - secs = time_from_now; - repeat = repeating; - TimerManager::AddTimer(this); }