summaryrefslogtreecommitdiff
path: root/src/nickcore.cpp
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2025-05-16 15:21:48 +0100
committerSadie Powell <sadie@witchery.services>2025-05-16 15:23:09 +0100
commita3d61e3d18f14aba3d3c63198e12f4bb8d9e187a (patch)
tree49b50daa00a2d9b24d2378c58f9d58a4862c1fd9 /src/nickcore.cpp
parentcac10aaa4163b5732068d90f03093ab43328a19a (diff)
Rename id to uniqueid to avoid shadowing.
Diffstat (limited to 'src/nickcore.cpp')
-rw-r--r--src/nickcore.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nickcore.cpp b/src/nickcore.cpp
index e05bda442..424b3e313 100644
--- a/src/nickcore.cpp
+++ b/src/nickcore.cpp
@@ -21,7 +21,7 @@ Serialize::Checker<nickcoreid_map> NickCoreIdList(NICKCORE_TYPE);
NickCore::NickCore(const Anope::string &coredisplay, uint64_t coreid)
: Serializable(NICKCORE_TYPE)
, chanaccess(CHANNELINFO_TYPE)
- , id(coreid)
+ , uniqueid(coreid)
, display(coredisplay)
, aliases(NICKALIAS_TYPE)
{
@@ -252,25 +252,25 @@ NickCore *NickCore::FindId(uint64_t id)
uint64_t NickCore::GetId()
{
- if (this->id)
- return this->id;
+ if (this->uniqueid)
+ return this->uniqueid;
// We base the account identifier on the account display at registration and
// when the account was first registered. This should be unique enough that
// it never collides. In the extremely rare case that it does generate a
// duplicate id we try with a new suffix.
uint64_t attempt = 0;
- while (!this->id)
+ while (!this->uniqueid)
{
const auto newidstr = this->display + "\0" + Anope::ToString(this->registered) + "\0" + Anope::ToString(attempt++);
const auto newid = Anope::hash_cs()(newidstr);
if (NickCoreIdList->emplace(newid, this).second)
{
- this->id = newid;
+ this->uniqueid = newid;
this->QueueUpdate();
break;
}
}
- return this->id;
+ return this->uniqueid;
}