diff options
| -rw-r--r-- | include/timers.h | 8 | ||||
| -rw-r--r-- | modules/nickserv/nickserv.cpp | 2 | ||||
| -rw-r--r-- | modules/proxyscan.cpp | 2 | ||||
| -rw-r--r-- | src/timers.cpp | 8 | ||||
| -rw-r--r-- | src/uplink.cpp | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/include/timers.h b/include/timers.h index 19e5290e9..ad436c0db 100644 --- a/include/timers.h +++ b/include/timers.h @@ -24,9 +24,9 @@ private: */ time_t trigger; - /** Numer of seconds between triggers + /** Number of seconds between triggers */ - long secs; + time_t secs; /** True if this is a repeating timer */ @@ -37,14 +37,14 @@ public: * @param time_from_now The number of seconds from now to trigger the timer * @param repeating Repeat this timer every time_from_now if this is true */ - Timer(long time_from_now, bool repeating = false); + Timer(time_t time_from_now, bool repeating = false); /** Constructor, initializes the triggering time * @param creator The creator of the timer * @param time_from_now The number of seconds from now to trigger the timer * @param repeating Repeat this timer every time_from_now if this is true */ - Timer(Module *creator, long time_from_now, bool repeating = false); + Timer(Module *creator, time_t time_from_now, bool repeating = false); /** Destructor, removes the timer from the list */ diff --git a/modules/nickserv/nickserv.cpp b/modules/nickserv/nickserv.cpp index 08fd286a0..75ed0e8d3 100644 --- a/modules/nickserv/nickserv.cpp +++ b/modules/nickserv/nickserv.cpp @@ -70,7 +70,7 @@ class NickServHeld final Reference<NickAlias> na; Anope::string nick; public: - NickServHeld(Module *me, NickAlias *n, long l) + NickServHeld(Module *me, NickAlias *n, time_t l) : Timer(me, l) , na(n) , nick(na->nick) diff --git a/modules/proxyscan.cpp b/modules/proxyscan.cpp index 4634b9f95..601987bcd 100644 --- a/modules/proxyscan.cpp +++ b/modules/proxyscan.cpp @@ -211,7 +211,7 @@ class ModuleProxyScan final : public Timer { public: - ConnectionTimeout(Module *c, long timeout) + ConnectionTimeout(Module *c, time_t timeout) : Timer(c, timeout, true) { } diff --git a/src/timers.cpp b/src/timers.cpp index 74641e40f..9e0f46277 100644 --- a/src/timers.cpp +++ b/src/timers.cpp @@ -11,20 +11,20 @@ std::multimap<time_t, Timer *> TimerManager::Timers; -Timer::Timer(long time_from_now, bool repeating) +Timer::Timer(time_t time_from_now, bool repeating) { owner = NULL; - trigger = Anope::CurTime + time_from_now; + trigger = Anope::CurTime + std::abs(time_from_now); secs = time_from_now; repeat = repeating; TimerManager::AddTimer(this); } -Timer::Timer(Module *creator, long time_from_now, bool repeating) +Timer::Timer(Module *creator, time_t time_from_now, bool repeating) { owner = creator; - trigger = Anope::CurTime + time_from_now; + trigger = Anope::CurTime + std::abs(time_from_now); secs = time_from_now; repeat = repeating; diff --git a/src/uplink.cpp b/src/uplink.cpp index 60e278dce..0e4605841 100644 --- a/src/uplink.cpp +++ b/src/uplink.cpp @@ -21,7 +21,7 @@ class ReconnectTimer final : public Timer { public: - ReconnectTimer(int wait) + ReconnectTimer(time_t wait) : Timer(wait) { } |