summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/account.h2
-rw-r--r--include/extern.h6
-rw-r--r--modules/core/os_stats.cpp4
-rw-r--r--src/nickcore.cpp2
-rw-r--r--src/nickserv.cpp47
5 files changed, 28 insertions, 33 deletions
diff --git a/include/account.h b/include/account.h
index c625c4e0e..eda40ef94 100644
--- a/include/account.h
+++ b/include/account.h
@@ -198,7 +198,7 @@ class CoreExport NickCore : public Extensible, public Flags<NickCoreFlag, NI_END
*
* Retrieves an entry from the access list corresponding to the given index.
*/
- Anope::string GetAccess(unsigned entry);
+ Anope::string GetAccess(unsigned entry) const;
/** Find an entry in the nick's access list
*
diff --git a/include/extern.h b/include/extern.h
index 4fafd494e..08804764e 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -309,8 +309,8 @@ E void SetDefaultMLock();
/**** nickserv.c ****/
E NickRequest *findrequestnick(const Anope::string &nick);
-E void get_aliases_stats(long *nrec, long *memuse);
-E void get_core_stats(long *nrec, long *memuse);
+E void get_aliases_stats(long &count, long &mem);
+E void get_core_stats(long &count, long &mem);
E void change_core_display(NickCore *nc);
E void change_core_display(NickCore *nc, const Anope::string &newdisplay);
E int do_setmodes(User *u);
@@ -322,7 +322,7 @@ E void expire_nicks();
E void expire_requests();
E NickAlias *findnick(const Anope::string &nick);
E NickCore *findcore(const Anope::string &nick);
-E bool is_on_access(User *u, NickCore *nc);
+E bool is_on_access(const User *u, const NickCore *nc);
/**** process.c ****/
diff --git a/modules/core/os_stats.cpp b/modules/core/os_stats.cpp
index f554092e7..7b6bccae7 100644
--- a/modules/core/os_stats.cpp
+++ b/modules/core/os_stats.cpp
@@ -226,9 +226,9 @@ class CommandOSStats : public Command
notice_lang(Config.s_OperServ, u, OPER_STATS_USER_MEM, count, (mem + 512) / 1024);
get_channel_stats(&count, &mem);
notice_lang(Config.s_OperServ, u, OPER_STATS_CHANNEL_MEM, count, (mem + 512) / 1024);
- get_core_stats(&count, &mem);
+ get_core_stats(count, mem);
notice_lang(Config.s_OperServ, u, OPER_STATS_GROUPS_MEM, count, (mem + 512) / 1024);
- get_aliases_stats(&count, &mem);
+ get_aliases_stats(count, mem);
notice_lang(Config.s_OperServ, u, OPER_STATS_ALIASES_MEM, count, (mem + 512) / 1024);
get_chanserv_stats(&count, &mem);
notice_lang(Config.s_OperServ, u, OPER_STATS_CHANSERV_MEM, count, (mem + 512) / 1024);
diff --git a/src/nickcore.cpp b/src/nickcore.cpp
index 2996c6afc..a3b97a6e7 100644
--- a/src/nickcore.cpp
+++ b/src/nickcore.cpp
@@ -95,7 +95,7 @@ void NickCore::AddAccess(const Anope::string &entry)
FOREACH_MOD(I_OnNickAddAccess, OnNickAddAccess(this, entry));
}
-Anope::string NickCore::GetAccess(unsigned entry)
+Anope::string NickCore::GetAccess(unsigned entry) const
{
if (access.empty() || entry >= access.size())
return "";
diff --git a/src/nickserv.cpp b/src/nickserv.cpp
index 960ae7a97..0ed7a2cdf 100644
--- a/src/nickserv.cpp
+++ b/src/nickserv.cpp
@@ -26,7 +26,7 @@ static nickservreleases_map NickServReleases;
NickServCollide::NickServCollide(const Anope::string &_nick, time_t delay) : Timer(delay), nick(_nick)
{
/* Erase the current collide and use the new one */
- nickservcollides_map::iterator nit = NickServCollides.find(nick);
+ nickservcollides_map::iterator nit = NickServCollides.find(this->nick);
if (nit != NickServCollides.end())
delete nit->second;
@@ -35,14 +35,14 @@ NickServCollide::NickServCollide(const Anope::string &_nick, time_t delay) : Tim
NickServCollide::~NickServCollide()
{
- NickServCollides.erase(nick);
+ NickServCollides.erase(this->nick);
}
void NickServCollide::Tick(time_t ctime)
{
/* If they identified or don't exist anymore, don't kill them. */
- User *u = finduser(nick);
- NickAlias *na = findnick(nick);
+ User *u = finduser(this->nick);
+ NickAlias *na = findnick(this->nick);
if (!u || !na || u->Account() == na->nc || u->my_signon > this->GetSetTime())
return;
@@ -52,7 +52,7 @@ void NickServCollide::Tick(time_t ctime)
NickServRelease::NickServRelease(const Anope::string &_nick, const Anope::string &_uid, time_t delay) : Timer(delay), nick(_nick), uid(_uid)
{
/* Erase the current release timer and use the new one */
- nickservreleases_map::iterator nit = NickServReleases.find(nick);
+ nickservreleases_map::iterator nit = NickServReleases.find(this->nick);
if (nit != NickServReleases.end())
delete nit->second;
@@ -61,12 +61,12 @@ NickServRelease::NickServRelease(const Anope::string &_nick, const Anope::string
NickServRelease::~NickServRelease()
{
- NickServReleases.erase(nick);
+ NickServReleases.erase(this->nick);
}
void NickServRelease::Tick(time_t ctime)
{
- NickAlias *na = findnick(nick);
+ NickAlias *na = findnick(this->nick);
if (na)
na->Release();
@@ -83,9 +83,9 @@ void moduleAddNickServCmds()
/* Return information on memory use. Assumes pointers are valid. */
-void get_aliases_stats(long *nrec, long *memuse)
+void get_aliases_stats(long &count, long &mem)
{
- long count = 0, mem = 0;
+ count = mem = 0;
for (nickalias_map::const_iterator it = NickAliasList.begin(), it_end = NickAliasList.end(); it != it_end; ++it)
{
@@ -102,17 +102,15 @@ void get_aliases_stats(long *nrec, long *memuse)
if (!na->last_quit.empty())
mem += na->last_quit.length() + 1;
}
- *nrec = count;
- *memuse = mem;
}
/*************************************************************************/
/* Return information on memory use. Assumes pointers are valid. */
-void get_core_stats(long *nrec, long *memuse)
+void get_core_stats(long &count, long &mem)
{
- long count = 0, mem = 0;
+ count = mem = 0;
unsigned j, end;
for (nickcore_map::const_iterator it = NickCoreList.begin(), it_end = NickCoreList.end(); it != it_end; ++it)
@@ -141,8 +139,6 @@ void get_core_stats(long *nrec, long *memuse)
mem += sizeof(NickAlias *) * nc->aliases.size();
}
- *nrec = count;
- *memuse = mem;
}
/*************************************************************************/
@@ -187,16 +183,15 @@ void nickserv(User *u, const Anope::string &buf)
int validate_user(User *u)
{
- NickAlias *na;
- NickRequest *nr;
-
- if ((nr = findrequestnick(u->nick)))
+ NickRequest *nr = findrequestnick(u->nick);
+ if (nr)
{
notice_lang(Config.s_NickServ, u, NICK_IS_PREREG);
return 0;
}
- if (!(na = findnick(u->nick)))
+ NickAlias *na = findnick(u->nick);
+ if (!na)
return 0;
if (na->HasFlag(NS_FORBIDDEN))
@@ -284,7 +279,7 @@ void expire_nicks()
FOREACH_RESULT(I_OnPreNickExpire, OnPreNickExpire(na));
if (MOD_RESULT == EVENT_STOP)
continue;
- Alog() << "Expiring nickname " << na->nick << " (group: " << na->nc->display << ") (e-mail: " << (!na->nc->email.empty() ? na->nc->email : "none") << ")";
+ Alog() << "Expiring nickname " << na->nick << " (group: " << na->nc->display << ") (e-mail: " << (na->nc->email.empty() ? "none" : na->nc->email) << ")";
FOREACH_MOD(I_OnNickExpire, OnNickExpire(na));
delete na;
}
@@ -295,9 +290,10 @@ void expire_requests()
{
time_t now = time(NULL);
- for (nickrequest_map::const_iterator it = NickRequestList.begin(), it_end = NickRequestList.end(); it != it_end; ++it)
+ for (nickrequest_map::const_iterator it = NickRequestList.begin(), it_end = NickRequestList.end(); it != it_end; )
{
NickRequest *nr = it->second;
+ ++it;
if (Config.NSRExpire && now - nr->requested >= Config.NSRExpire)
{
@@ -347,7 +343,7 @@ NickCore *findcore(const Anope::string &nick)
* @param nc The nickcore
* @return true or false
*/
-bool is_on_access(User *u, NickCore *nc)
+bool is_on_access(const User *u, const NickCore *nc)
{
if (!u || !nc || nc->access.empty())
return false;
@@ -405,14 +401,13 @@ void change_core_display(NickCore *nc)
int do_setmodes(User *u)
{
- Channel *c;
-
/* Walk users current channels */
for (UChannelList::iterator it = u->chans.begin(), it_end = u->chans.end(); it != it_end; ++it)
{
ChannelContainer *cc = *it;
- if ((c = cc->chan))
+ Channel *c = cc->chan;
+ if (c)
chan_set_correct_modes(u, c, 1);
}
return MOD_CONT;
generated by cgit (git 2.34.1) at 2025-07-02 23:18:48 +0000