From 30b9f127113cc715cf90f87a298572b8a73b6788 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 11 Feb 2024 17:53:32 +0000 Subject: Remove the now parameter from the Timer class. This was never actually changed from the default. --- modules/botserv/bs_kick.cpp | 5 ++++- modules/botserv/bs_set.cpp | 7 ++++++- modules/chanserv/chanserv.cpp | 6 +++++- modules/chanserv/cs_ban.cpp | 8 +++++++- modules/dns.cpp | 13 ++++++++++--- modules/httpd.cpp | 8 +++++++- modules/nickserv/nickserv.cpp | 18 ++++++++++++++---- modules/operserv/os_defcon.cpp | 4 +++- modules/proxyscan.cpp | 3 ++- modules/sasl.cpp | 6 +++++- 10 files changed, 63 insertions(+), 15 deletions(-) (limited to 'modules') diff --git a/modules/botserv/bs_kick.cpp b/modules/botserv/bs_kick.cpp index f6012d07f..737db21be 100644 --- a/modules/botserv/bs_kick.cpp +++ b/modules/botserv/bs_kick.cpp @@ -1005,7 +1005,10 @@ class BanDataPurger final : public Timer { public: - BanDataPurger(Module *o) : Timer(o, 300, Anope::CurTime, true) { } + BanDataPurger(Module *o) + : Timer(o, 300, true) + { + } void Tick(time_t) override { diff --git a/modules/botserv/bs_set.cpp b/modules/botserv/bs_set.cpp index 636313785..6929c96fb 100644 --- a/modules/botserv/bs_set.cpp +++ b/modules/botserv/bs_set.cpp @@ -76,7 +76,12 @@ public: Anope::string mask; public: - UnbanTimer(Module *creator, const Anope::string &ch, const Anope::string &bmask, time_t t) : Timer(creator, t), chname(ch), mask(bmask) { } + UnbanTimer(Module *creator, const Anope::string &ch, const Anope::string &bmask, time_t t) + : Timer(creator, t) + , chname(ch) + , mask(bmask) + { + } void Tick(time_t) override { diff --git a/modules/chanserv/chanserv.cpp b/modules/chanserv/chanserv.cpp index c47f2d77f..783c47261 100644 --- a/modules/chanserv/chanserv.cpp +++ b/modules/chanserv/chanserv.cpp @@ -51,7 +51,11 @@ public: /** Constructor * @param chan The channel */ - ChanServTimer(Reference &cs, ExtensibleItem &i, Module *m, Channel *chan) : Timer(m, Config->GetModule(m)->Get("inhabit", "15s")), ChanServ(cs), inhabit(i), c(chan) + ChanServTimer(Reference &cs, ExtensibleItem &i, Module *m, Channel *chan) + : Timer(m, Config->GetModule(m)->Get("inhabit", "15s")) + , ChanServ(cs) + , inhabit(i) + , c(chan) { if (!ChanServ || !c) return; diff --git a/modules/chanserv/cs_ban.cpp b/modules/chanserv/cs_ban.cpp index ff019e602..da54cd4f1 100644 --- a/modules/chanserv/cs_ban.cpp +++ b/modules/chanserv/cs_ban.cpp @@ -22,7 +22,13 @@ private: Anope::string mode; public: - TempBan(time_t seconds, Channel *c, const Anope::string &banmask, const Anope::string &mod) : Timer(me, seconds), channel(c->name), mask(banmask), mode(mod) { } + TempBan(time_t seconds, Channel *c, const Anope::string &banmask, const Anope::string &mod) + : Timer(me, seconds) + , channel(c->name) + , mask(banmask) + , mode(mod) + { + } void Tick(time_t ctime) override { diff --git a/modules/dns.cpp b/modules/dns.cpp index a75ca6820..3a2b2fb9a 100644 --- a/modules/dns.cpp +++ b/modules/dns.cpp @@ -477,8 +477,11 @@ public: int length = 0; public: - Client(Manager *m, TCPSocket *l, int fd, const sockaddrs &addr) : Socket(fd, l->GetFamily()), ClientSocket(l, addr), Timer(5), - manager(m) + Client(Manager *m, TCPSocket *l, int fd, const sockaddrs &addr) + : Socket(fd, l->GetFamily()) + , ClientSocket(l, addr) + , Timer(5) + , manager(m) { Log(LOG_DEBUG_2) << "Resolver: New client from " << addr.addr(); } @@ -670,7 +673,11 @@ class MyManager final public: std::map requests; - MyManager(Module *creator) : Manager(creator), Timer(300, Anope::CurTime, true), serial(Anope::CurTime), cur_id(rand()) + MyManager(Module *creator) + : Manager(creator) + , Timer(300, true) + , serial(Anope::CurTime) + , cur_id(rand()) { } diff --git a/modules/httpd.cpp b/modules/httpd.cpp index c80507621..f561283d7 100644 --- a/modules/httpd.cpp +++ b/modules/httpd.cpp @@ -292,7 +292,13 @@ class MyHTTPProvider final std::list > clients; public: - MyHTTPProvider(Module *c, const Anope::string &n, const Anope::string &i, const unsigned short p, const int t, bool s) : Socket(-1, i.find(':') == Anope::string::npos ? AF_INET : AF_INET6), HTTPProvider(c, n, i, p, s), Timer(c, 10, Anope::CurTime, true), timeout(t) { } + MyHTTPProvider(Module *c, const Anope::string &n, const Anope::string &i, const unsigned short p, const int t, bool s) + : Socket(-1, i.find(':') == Anope::string::npos ? AF_INET : AF_INET6) + , HTTPProvider(c, n, i, p, s) + , Timer(c, 10, true) + , timeout(t) + { + } void Tick(time_t) override { diff --git a/modules/nickserv/nickserv.cpp b/modules/nickserv/nickserv.cpp index 0f4313c0e..08fd286a0 100644 --- a/modules/nickserv/nickserv.cpp +++ b/modules/nickserv/nickserv.cpp @@ -25,7 +25,12 @@ class NickServCollide final Reference na; public: - NickServCollide(Module *me, NickServService *nss, User *user, NickAlias *nick, time_t delay) : Timer(me, delay), service(nss), u(user), ts(user->timestamp), na(nick) + NickServCollide(Module *me, NickServService *nss, User *user, NickAlias *nick, time_t delay) + : Timer(me, delay) + , service(nss) + , u(user) + , ts(user->timestamp) + , na(nick) { collides.insert(this); } @@ -65,7 +70,10 @@ class NickServHeld final Reference na; Anope::string nick; public: - NickServHeld(Module *me, NickAlias *n, long l) : Timer(me, l), na(n), nick(na->nick) + NickServHeld(Module *me, NickAlias *n, long l) + : Timer(me, l) + , na(n) + , nick(na->nick) { n->Extend("HELD"); } @@ -89,8 +97,10 @@ class NickServRelease final Anope::string nick; public: - NickServRelease(Module *me, NickAlias *na, time_t delay) : User(na->nick, Config->GetModule("nickserv")->Get("enforceruser", "user"), - Config->GetModule("nickserv")->Get("enforcerhost", Me->GetName()), "", "", Me, "Services Enforcer", Anope::CurTime, "", IRCD->UID_Retrieve(), NULL), Timer(me, delay), nick(na->nick) + NickServRelease(Module *me, NickAlias *na, time_t delay) + : User(na->nick, Config->GetModule("nickserv")->Get("enforceruser", "user"), Config->GetModule("nickserv")->Get("enforcerhost", Me->GetName()), "", "", Me, "Services Enforcer", Anope::CurTime, "", IRCD->UID_Retrieve(), NULL) + , Timer(me, delay) + , nick(na->nick) { /* Erase the current release timer and use the new one */ Anope::map::iterator nit = NickServReleases.find(this->nick); diff --git a/modules/operserv/os_defcon.cpp b/modules/operserv/os_defcon.cpp index 5664f5ffb..3f5395d48 100644 --- a/modules/operserv/os_defcon.cpp +++ b/modules/operserv/os_defcon.cpp @@ -111,7 +111,9 @@ class DefConTimeout final int level; public: - DefConTimeout(Module *mod, int newlevel) : Timer(mod, DConfig.timeout), level(newlevel) + DefConTimeout(Module *mod, int newlevel) + : Timer(mod, DConfig.timeout) + , level(newlevel) { timeout = this; } diff --git a/modules/proxyscan.cpp b/modules/proxyscan.cpp index b92de0dea..4634b9f95 100644 --- a/modules/proxyscan.cpp +++ b/modules/proxyscan.cpp @@ -211,7 +211,8 @@ class ModuleProxyScan final : public Timer { public: - ConnectionTimeout(Module *c, long timeout) : Timer(c, timeout, Anope::CurTime, true) + ConnectionTimeout(Module *c, long timeout) + : Timer(c, timeout, true) { } diff --git a/modules/sasl.cpp b/modules/sasl.cpp index 298ad0e75..adf044a0b 100644 --- a/modules/sasl.cpp +++ b/modules/sasl.cpp @@ -181,7 +181,11 @@ class SASLService final std::map sessions; public: - SASLService(Module *o) : SASL::Service(o), Timer(o, 60, Anope::CurTime, true) { } + SASLService(Module *o) + : SASL::Service(o) + , Timer(o, 60, true) + { + } ~SASLService() override { -- cgit