From f00e76d30a86acf0f18bcde5647eedd50de50569 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 10 Sep 2010 20:31:31 -0400 Subject: Added Anope::CurTime to keep us from calling time() everywhere --- modules/core/bs_act.cpp | 2 +- modules/core/bs_say.cpp | 2 +- modules/core/cs_topic.cpp | 2 +- modules/core/db_plain.cpp | 2 +- modules/core/hs_set.cpp | 2 +- modules/core/hs_setall.cpp | 2 +- modules/core/ns_group.cpp | 8 ++++---- modules/core/ns_identify.cpp | 2 +- modules/core/ns_register.cpp | 16 ++++++++-------- modules/core/ns_resetpass.cpp | 6 +++--- modules/core/ns_update.cpp | 2 +- modules/core/os_akill.cpp | 4 ++-- modules/core/os_chankill.cpp | 2 +- modules/core/os_defcon.cpp | 4 ++-- modules/core/os_ignore.cpp | 4 +--- modules/core/os_news.cpp | 2 +- modules/core/os_session.cpp | 4 ++-- modules/core/os_snline.cpp | 4 ++-- modules/core/os_sqline.cpp | 4 ++-- modules/core/os_stats.cpp | 2 +- modules/core/os_svsnick.cpp | 2 +- modules/core/os_szline.cpp | 4 ++-- 22 files changed, 40 insertions(+), 42 deletions(-) (limited to 'modules/core') diff --git a/modules/core/bs_act.cpp b/modules/core/bs_act.cpp index d52dbdb78..a3487a0ab 100644 --- a/modules/core/bs_act.cpp +++ b/modules/core/bs_act.cpp @@ -48,7 +48,7 @@ class CommandBSAct : public Command message.erase(i, 1); ircdproto->SendAction(ci->bi, ci->name, "%s", message.c_str()); - ci->bi->lastmsg = time(NULL); + ci->bi->lastmsg = Anope::CurTime; // XXX Need to be able to find if someone is overriding this. Log(LOG_COMMAND, u, this, ci) << message; diff --git a/modules/core/bs_say.cpp b/modules/core/bs_say.cpp index 916cf8fca..34524e11c 100644 --- a/modules/core/bs_say.cpp +++ b/modules/core/bs_say.cpp @@ -54,7 +54,7 @@ class CommandBSSay : public Command } ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", text.c_str()); - ci->bi->lastmsg = time(NULL); + ci->bi->lastmsg = Anope::CurTime; // XXX need a way to find if someone is overriding this Log(LOG_COMMAND, u, this, ci) << text; diff --git a/modules/core/cs_topic.cpp b/modules/core/cs_topic.cpp index ebd09b385..98ca4a2ac 100644 --- a/modules/core/cs_topic.cpp +++ b/modules/core/cs_topic.cpp @@ -36,7 +36,7 @@ class CommandCSTopic : public Command { ci->last_topic = topic; ci->last_topic_setter = u->nick; - ci->last_topic_time = time(NULL); + ci->last_topic_time = Anope::CurTime; c->topic = topic; c->topic_setter = u->nick; diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp index 6ac61ba11..643146f5d 100644 --- a/modules/core/db_plain.cpp +++ b/modules/core/db_plain.cpp @@ -520,7 +520,7 @@ class DBPlain : public Module if (!IsFile(DatabaseFile)) return; - time_t now = time(NULL); + time_t now = Anope::CurTime; tm *tm = localtime(&now); if (tm->tm_mday != LastDay) diff --git a/modules/core/hs_set.cpp b/modules/core/hs_set.cpp index 68407790a..ca554933c 100644 --- a/modules/core/hs_set.cpp +++ b/modules/core/hs_set.cpp @@ -72,7 +72,7 @@ class CommandHSSet : public Command return MOD_CONT; } - tmp_time = time(NULL); + tmp_time = Anope::CurTime; if ((na = findnick(nick))) { diff --git a/modules/core/hs_setall.cpp b/modules/core/hs_setall.cpp index bea594da6..715559c5a 100644 --- a/modules/core/hs_setall.cpp +++ b/modules/core/hs_setall.cpp @@ -84,7 +84,7 @@ class CommandHSSetAll : public Command return MOD_CONT; } - tmp_time = time(NULL); + tmp_time = Anope::CurTime; Log(LOG_ADMIN, u, this) << "to set the vhost for all nicks in group " << na->nc->display << " to " << (!vIdent.empty() ? vIdent + "@" : "") << hostmask; diff --git a/modules/core/ns_group.cpp b/modules/core/ns_group.cpp index 22fad9b3c..6bb187908 100644 --- a/modules/core/ns_group.cpp +++ b/modules/core/ns_group.cpp @@ -57,8 +57,8 @@ class CommandNSGroup : public Command na = findnick(u->nick); if (!(target = findnick(nick))) notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); - else if (time(NULL) < u->lastnickreg + Config->NSRegDelay) - notice_lang(Config->s_NickServ, u, NICK_GROUP_PLEASE_WAIT, (Config->NSRegDelay + u->lastnickreg) - time(NULL)); + else if (Anope::CurTime < u->lastnickreg + Config->NSRegDelay) + notice_lang(Config->s_NickServ, u, NICK_GROUP_PLEASE_WAIT, (Config->NSRegDelay + u->lastnickreg) - Anope::CurTime); else if (u->Account() && u->Account()->HasFlag(NI_SUSPENDED)) { //Alog() << Config->s_NickServ << ": " << u->GetMask() << " tried to use GROUP from SUSPENDED nick " << target->nick; @@ -113,7 +113,7 @@ class CommandNSGroup : public Command Anope::string last_usermask = u->GetIdent() + "@" + u->GetDisplayedHost(); na->last_usermask = last_usermask; na->last_realname = u->realname; - na->time_registered = na->last_seen = time(NULL); + na->time_registered = na->last_seen = Anope::CurTime; u->Login(na->nc); FOREACH_MOD(I_OnNickGroup, OnNickGroup(u, target)); @@ -122,7 +122,7 @@ class CommandNSGroup : public Command Log(LOG_COMMAND, u, this) << "makes " << u->nick << " join group of " << target->nick << " (" << target->nc->display << ") (email: " << (!target->nc->email.empty() ? target->nc->email : "none") << ")"; notice_lang(Config->s_NickServ, u, NICK_GROUP_JOINED, target->nick.c_str()); - u->lastnickreg = time(NULL); + u->lastnickreg = Anope::CurTime; check_memos(u); } diff --git a/modules/core/ns_identify.cpp b/modules/core/ns_identify.cpp index 1d4938058..e87d13d22 100644 --- a/modules/core/ns_identify.cpp +++ b/modules/core/ns_identify.cpp @@ -63,7 +63,7 @@ class CommandNSIdentify : public Command Log(LOG_COMMAND, "nickserv/identify") << "to log out of account " << u->Account()->display; na->last_realname = u->realname; - na->last_seen = time(NULL); + na->last_seen = Anope::CurTime; u->Login(na->nc); ircdproto->SendAccountLogin(u, u->Account()); diff --git a/modules/core/ns_register.cpp b/modules/core/ns_register.cpp index 48a869bb8..b95b0c68a 100644 --- a/modules/core/ns_register.cpp +++ b/modules/core/ns_register.cpp @@ -50,7 +50,7 @@ class CommandNSConfirm : public Command na->nc->AddAccess(create_mask(u)); } - na->time_registered = na->last_seen = time(NULL); + na->time_registered = na->last_seen = Anope::CurTime; na->nc->language = Config->NSDefLanguage; if (!nr->email.empty()) na->nc->email = nr->email; @@ -71,7 +71,7 @@ class CommandNSConfirm : public Command if (enc_decrypt(na->nc->pass, tmp_pass) == 1) notice_lang(Config->s_NickServ, u, NICK_PASSWORD_IS, tmp_pass.c_str()); - u->lastnickreg = time(NULL); + u->lastnickreg = Anope::CurTime; } else { @@ -201,7 +201,7 @@ class CommandNSRegister : public CommandNSConfirm return MOD_CONT; } - if (!is_oper(u) && Config->NickRegDelay && time(NULL) - u->my_signon < Config->NickRegDelay) + if (!is_oper(u) && Config->NickRegDelay && Anope::CurTime - u->my_signon < Config->NickRegDelay) { notice_lang(Config->s_NickServ, u, NICK_REG_DELAY, Config->NickRegDelay); return MOD_CONT; @@ -244,8 +244,8 @@ class CommandNSRegister : public CommandNSConfirm if (Config->NSForceEmail && email.empty()) this->OnSyntaxError(u, ""); - else if (time(NULL) < u->lastnickreg + Config->NSRegDelay) - notice_lang(Config->s_NickServ, u, NICK_REG_PLEASE_WAIT, (u->lastnickreg + Config->NSRegDelay) - time(NULL)); + else if (Anope::CurTime < u->lastnickreg + Config->NSRegDelay) + notice_lang(Config->s_NickServ, u, NICK_REG_PLEASE_WAIT, (u->lastnickreg + Config->NSRegDelay) - Anope::CurTime); else if ((na = findnick(u->nick))) { /* i.e. there's already such a nick regged */ @@ -273,7 +273,7 @@ class CommandNSRegister : public CommandNSConfirm enc_encrypt(pass, nr->password); if (!email.empty()) nr->email = email; - nr->requested = time(NULL); + nr->requested = Anope::CurTime; FOREACH_MOD(I_OnMakeNickRequest, OnMakeNickRequest(nr)); if (Config->NSEmailReg) { @@ -335,14 +335,14 @@ class CommandNSResend : public Command { if ((nr = findrequestnick(u->nick))) { - if (time(NULL) < nr->lastmail + Config->NSResendDelay) + if (Anope::CurTime < nr->lastmail + Config->NSResendDelay) { notice_lang(Config->s_NickServ, u, MAIL_LATER); return MOD_CONT; } if (!SendRegmail(u, nr)) { - nr->lastmail = time(NULL); + nr->lastmail = Anope::CurTime; notice_lang(Config->s_NickServ, u, NICK_REG_RESENT, nr->email.c_str()); Log(LOG_COMMAND, u, this) << "resend registration verification code for " << nr->nick; } diff --git a/modules/core/ns_resetpass.cpp b/modules/core/ns_resetpass.cpp index ccb597862..a0efa373c 100644 --- a/modules/core/ns_resetpass.cpp +++ b/modules/core/ns_resetpass.cpp @@ -90,7 +90,7 @@ class NSResetPass : public Module Anope::string c; if (na && na->nc->GetExtRegular("ns_resetpass_code", c) && na->nc->GetExtRegular("ns_resetpass_time", t)) { - if (t < time(NULL) - 3600) + if (t < Anope::CurTime - 3600) { na->nc->Shrink("ns_resetpass_code"); na->nc->Shrink("ns_resetpass_time"); @@ -106,7 +106,7 @@ class NSResetPass : public Module u->UpdateHost(); na->last_realname = u->realname; - na->last_seen = time(NULL); + na->last_seen = Anope::CurTime; u->Login(na->nc); ircdproto->SendAccountLogin(u, u->Account()); ircdproto->SetAutoIdentificationToken(u); @@ -162,7 +162,7 @@ static bool SendResetEmail(User *u, NickAlias *na) na->nc->Shrink("ns_resetpass_time"); na->nc->Extend("ns_resetpass_code", new ExtensibleItemRegular(passcode)); - na->nc->Extend("ns_resetpass_time", new ExtensibleItemRegular(time(NULL))); + na->nc->Extend("ns_resetpass_time", new ExtensibleItemRegular(Anope::CurTime)); return Mail(u, na->nc, Config->s_NickServ, subject, message); } diff --git a/modules/core/ns_update.cpp b/modules/core/ns_update.cpp index baeae756c..e101158a9 100644 --- a/modules/core/ns_update.cpp +++ b/modules/core/ns_update.cpp @@ -31,7 +31,7 @@ class CommandNSUpdate : public Command check_memos(u); na->last_realname = u->realname; - na->last_seen = time(NULL); + na->last_seen = Anope::CurTime; if (ircd->vhost) do_on_id(u); notice_lang(Config->s_NickServ, u, NICK_UPDATE_SUCCESS, Config->s_NickServ.c_str()); diff --git a/modules/core/os_akill.cpp b/modules/core/os_akill.cpp index abda0348a..1f4614465 100644 --- a/modules/core/os_akill.cpp +++ b/modules/core/os_akill.cpp @@ -155,7 +155,7 @@ class CommandOSAKill : public Command return MOD_CONT; } else if (expires > 0) - expires += time(NULL); + expires += Anope::CurTime; if (params.size() <= last_param) { @@ -183,7 +183,7 @@ class CommandOSAKill : public Command buf = "does not expire"; else { - int wall_expiry = expires - time(NULL); + time_t wall_expiry = expires - Anope::CurTime; Anope::string s; if (wall_expiry >= 86400) diff --git a/modules/core/os_chankill.cpp b/modules/core/os_chankill.cpp index 04ce6603c..81b15710a 100644 --- a/modules/core/os_chankill.cpp +++ b/modules/core/os_chankill.cpp @@ -44,7 +44,7 @@ class CommandOSChanKill : public Command return MOD_CONT; } else if (expires > 0) - expires += time(NULL); + expires += Anope::CurTime; if (params.size() <= last_param) { diff --git a/modules/core/os_defcon.cpp b/modules/core/os_defcon.cpp index 711046beb..18a1ecfa0 100644 --- a/modules/core/os_defcon.cpp +++ b/modules/core/os_defcon.cpp @@ -158,7 +158,7 @@ class OSDefcon : public Module if (CheckDefCon(DEFCON_AKILL_NEW_CLIENTS)) { Log(OperServ, "operserv/defcon") << "DEFCON: adding akill for *@" << u->host; - XLine *x = SGLine->Add(NULL, NULL, "*@" + u->host, time(NULL) + Config->DefConAKILL, !Config->DefConAkillReason.empty() ? Config->DefConAkillReason : "DEFCON AKILL"); + XLine *x = SGLine->Add(NULL, NULL, "*@" + u->host, Anope::CurTime + Config->DefConAKILL, !Config->DefConAkillReason.empty() ? Config->DefConAkillReason : "DEFCON AKILL"); if (x) x->By = Config->s_OperServ; } @@ -289,7 +289,7 @@ class OSDefcon : public Module ++session->hits; if (Config->MaxSessionKill && session->hits >= Config->MaxSessionKill) { - SGLine->Add(NULL, NULL, "*@" + u->host, time(NULL) + Config->SessionAutoKillExpiry, "Session limit exceeded"); + SGLine->Add(NULL, NULL, "*@" + u->host, Anope::CurTime + Config->SessionAutoKillExpiry, "Session limit exceeded"); ircdproto->SendGlobops(OperServ, "Added a temporary AKILL for \2*@%s\2 due to excessive connections", u->host.c_str()); } } diff --git a/modules/core/os_ignore.cpp b/modules/core/os_ignore.cpp index 05ac57c9b..9cb5cf4d2 100644 --- a/modules/core/os_ignore.cpp +++ b/modules/core/os_ignore.cpp @@ -164,11 +164,9 @@ class OSIgnore : public Module void OnDatabaseWrite(void (*Write)(const Anope::string &)) { - time_t now = time(NULL); - for (std::list::iterator ign = ignore.begin(), ign_end = ignore.end(); ign != ign_end; ) { - if ((*ign)->time && (*ign)->time <= now) + if ((*ign)->time && (*ign)->time <= Anope::CurTime) { Log(LOG_DEBUG) << "[os_ignore] Expiring ignore entry " << (*ign)->mask; delete *ign; diff --git a/modules/core/os_news.cpp b/modules/core/os_news.cpp index 8b286eebb..f77db4494 100644 --- a/modules/core/os_news.cpp +++ b/modules/core/os_news.cpp @@ -142,7 +142,7 @@ static int add_newsitem(User *u, const Anope::string &text, NewsType type) news->type = type; news->num = num + 1; news->Text = text; - news->time = time(NULL); + news->time = Anope::CurTime; news->who = u->nick; News.push_back(news); diff --git a/modules/core/os_session.cpp b/modules/core/os_session.cpp index 9f81ef12d..84619e9b3 100644 --- a/modules/core/os_session.cpp +++ b/modules/core/os_session.cpp @@ -114,7 +114,7 @@ class ExceptionViewCallback : public ExceptionListCallback char timebuf[32]; struct tm tm; - time_t t = time(NULL); + time_t t = Anope::CurTime; tm = *localtime(exceptions[index]->time ? &exceptions[index]->time : &t); strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, &tm); @@ -249,7 +249,7 @@ class CommandOSException : public Command return MOD_CONT; } else if (expires > 0) - expires += time(NULL); + expires += Anope::CurTime; int limit = !limitstr.empty() && limitstr.is_number_only() ? convertTo(limitstr) : -1; diff --git a/modules/core/os_snline.cpp b/modules/core/os_snline.cpp index 30be073b5..10c813dd9 100644 --- a/modules/core/os_snline.cpp +++ b/modules/core/os_snline.cpp @@ -153,7 +153,7 @@ class CommandOSSNLine : public Command return MOD_CONT; } else if (expires > 0) - expires += time(NULL); + expires += Anope::CurTime; if (param.empty()) { @@ -200,7 +200,7 @@ class CommandOSSNLine : public Command buf = "does not expire"; else { - int wall_expiry = expires - time(NULL); + time_t wall_expiry = expires - Anope::CurTime; Anope::string s; if (wall_expiry >= 86400) diff --git a/modules/core/os_sqline.cpp b/modules/core/os_sqline.cpp index e014d6c82..68a28347a 100644 --- a/modules/core/os_sqline.cpp +++ b/modules/core/os_sqline.cpp @@ -152,7 +152,7 @@ class CommandOSSQLine : public Command return MOD_CONT; } else if (expires > 0) - expires += time(NULL); + expires += Anope::CurTime; if (params.size() <= last_param) { @@ -180,7 +180,7 @@ class CommandOSSQLine : public Command buf = "does not expire"; else { - int wall_expiry = expires - time(NULL); + time_t wall_expiry = expires - Anope::CurTime; Anope::string s; if (wall_expiry >= 86400) diff --git a/modules/core/os_stats.cpp b/modules/core/os_stats.cpp index d965c7dc5..332b6ba4f 100644 --- a/modules/core/os_stats.cpp +++ b/modules/core/os_stats.cpp @@ -130,7 +130,7 @@ class CommandOSStats : public Command CommandReturn DoStatsUptime(User *u) { char timebuf[64]; - time_t uptime = time(NULL) - start_time; + time_t uptime = Anope::CurTime - start_time; int days = uptime / 86400, hours = (uptime / 3600) % 24, mins = (uptime / 60) % 60, secs = uptime % 60; notice_lang(Config->s_OperServ, u, OPER_STATS_CURRENT_USERS, usercnt, opcnt); struct tm *tm = localtime(&maxusertime); diff --git a/modules/core/os_svsnick.cpp b/modules/core/os_svsnick.cpp index a459691b0..537b32b6a 100644 --- a/modules/core/os_svsnick.cpp +++ b/modules/core/os_svsnick.cpp @@ -59,7 +59,7 @@ class CommandOSSVSNick : public Command { notice_lang(Config->s_OperServ, u, OPER_SVSNICK_NEWNICK, nick.c_str(), newnick.c_str()); ircdproto->SendGlobops(OperServ, "%s used SVSNICK to change %s to %s", u->nick.c_str(), nick.c_str(), newnick.c_str()); - ircdproto->SendForceNickChange(u2, newnick, time(NULL)); + ircdproto->SendForceNickChange(u2, newnick, Anope::CurTime); } return MOD_CONT; } diff --git a/modules/core/os_szline.cpp b/modules/core/os_szline.cpp index 6174d4c43..0d024282a 100644 --- a/modules/core/os_szline.cpp +++ b/modules/core/os_szline.cpp @@ -152,7 +152,7 @@ class CommandOSSZLine : public Command return MOD_CONT; } else if (expires > 0) - expires += time(NULL); + expires += Anope::CurTime; if (params.size() <= last_param) { @@ -180,7 +180,7 @@ class CommandOSSZLine : public Command buf = "does not expire"; else { - int wall_expiry = expires - time(NULL); + time_t wall_expiry = expires - Anope::CurTime; Anope::string s; if (wall_expiry >= 86400) -- cgit