diff options
| author |  Sadie Powell | 2021-07-04 14:45:03 +0100 |
|---|---|---|
| committer | Sadie Powell | 2021-07-04 14:53:16 +0100 |
| commit | 5bc4720d55116b1a668e32add2a2b2da459010f2 (patch) | |
| tree | 541228319bc34fc18277cd555998c3bb04ce70ae /src/modules/m_callerid.cpp | |
| parent | Move ModeParser::BuildPrefixes to core_mode. (diff) | |
| parent | Allow hostchange to select users based on connect class. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_callerid.cpp')
| -rw-r--r-- | src/modules/m_callerid.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 9cf857460..a86e0c0a5 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -138,14 +138,14 @@ struct CallerIDExtInfo : public ExtensionItem // We need to walk the list of users on our accept list, and remove ourselves from their wholistsme. for (const auto& user : dat->accepting) { - callerid_data* targ = this->Get(user, false); - if (!targ) + callerid_data* target = this->Get(user, false); + if (!target) { ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (1)"); continue; // shouldn't happen, but oh well. } - if (!stdalgo::vector::swaperase(targ->wholistsme, dat)) + if (!stdalgo::vector::swaperase(target->wholistsme, dat)) ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "ERROR: Inconsistency detected in callerid state, please report (2)"); } delete dat; @@ -289,8 +289,8 @@ public: } // Now, look them up, and add me to their list - callerid_data *targ = extInfo.Get(whotoadd, true); - targ->wholistsme.push_back(dat); + callerid_data* target = extInfo.Get(whotoadd, true); + target->wholistsme.push_back(dat); user->WriteNotice(whotoadd->nick + " is now on your accept list"); return true; |