summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/channels.cpp2
-rw-r--r--src/commands.cpp6
-rw-r--r--src/modules.cpp2
-rw-r--r--src/modules/extra/m_ssl_oper_cert.cpp2
-rw-r--r--src/modules/m_banexception.cpp5
-rw-r--r--src/modules/m_customtitle.cpp2
-rw-r--r--src/modules/m_denychans.cpp8
-rw-r--r--src/modules/m_hostchange.cpp2
-rw-r--r--src/modules/m_inviteexception.cpp10
-rw-r--r--src/modules/m_safelist.cpp4
-rw-r--r--src/modules/m_tline.cpp7
-rw-r--r--src/xline.cpp10
12 files changed, 27 insertions, 33 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index b0de06267..4286abfef 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -962,7 +962,7 @@ long Channel::GetMaxBans()
/* If there isnt one, we have to do some O(n) hax to find it the first time. (ick) */
for (std::map<std::string,int>::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++)
{
- if (match(this->name,n->first.c_str()))
+ if (match(this->name,n->first))
{
this->maxbans = n->second;
return n->second;
diff --git a/src/commands.cpp b/src/commands.cpp
index 017264621..53008eb54 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -33,7 +33,7 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user)
for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
{
- if ((match(u->second->MakeHost(),mask.c_str(),true)) || (match(u->second->MakeHostIP(),mask.c_str(),true)))
+ if ((match(u->second->MakeHost(), mask, true)) || (match(u->second->MakeHostIP(), mask, true)))
{
matches++;
}
@@ -64,7 +64,7 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user)
for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
{
- if (match(u->second->GetIPString(),ip.c_str(),true))
+ if (match(u->second->GetIPString(),ip,true))
matches++;
}
@@ -93,7 +93,7 @@ bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user)
for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++)
{
- if (match(u->second->nick,nick.c_str()))
+ if (match(u->second->nick,nick))
matches++;
}
diff --git a/src/modules.cpp b/src/modules.cpp
index b051085fd..5cfbd6f93 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -715,7 +715,7 @@ Channel* InspIRCd::GetChannelIndex(long index)
bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern)
{
- return match(sliteral.c_str(),spattern.c_str());
+ return match(sliteral, spattern);
}
CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector<std::string>& parameters, User* user)
diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp
index 34d947816..06c1110d0 100644
--- a/src/modules/extra/m_ssl_oper_cert.cpp
+++ b/src/modules/extra/m_ssl_oper_cert.cpp
@@ -104,7 +104,7 @@ class ModuleOperSSLCert : public Module
std::string xhost;
while (hl >> xhost)
{
- if (match(host,xhost.c_str()) || match(ip,xhost.c_str(),true))
+ if (match(host, xhost) || match(ip, xhost, true))
{
return true;
}
diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index bfb64449f..d90cbff29 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -73,9 +73,7 @@ public:
return 0;
}
- char mask[MAXBUF];
- snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
-
+ std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
for (modelist::iterator it = list->begin(); it != list->end(); it++)
{
if (match(user->GetFullRealHost(), it->mask) || match(user->GetFullHost(), it->mask) || (match(mask, it->mask, true)))
@@ -117,7 +115,6 @@ public:
LM->chan->GetExt(be->GetInfoKey(), list);
if (list)
{
- char mask[MAXBUF];
std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString();
for (modelist::iterator it = list->begin(); it != list->end(); it++)
{
diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 1dbcc219e..e195a490b 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -35,7 +35,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
std::string xhost;
while (hl >> xhost)
{
- if (match(host,xhost.c_str()) || match(ip,xhost.c_str(),true))
+ if (match(host, xhost) || match(ip,xhost, true))
{
return true;
}
diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index cab26122d..8d242edce 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -54,12 +54,12 @@ class ModuleDenyChannels : public Module
for (int j =0; j < Conf->Enumerate("badchan"); j++)
{
- if (match(redirect.c_str(), Conf->ReadValue("badchan","name",j).c_str()))
+ if (match(redirect, Conf->ReadValue("badchan","name",j)))
{
bool goodchan = false;
for (int k =0; k < Conf->Enumerate("goodchan"); k++)
{
- if (match(redirect.c_str(), Conf->ReadValue("goodchan","name",k).c_str()))
+ if (match(redirect, Conf->ReadValue("goodchan","name",k)))
goodchan = true;
}
@@ -91,7 +91,7 @@ class ModuleDenyChannels : public Module
{
for (int j =0; j < Conf->Enumerate("badchan"); j++)
{
- if (match(cname, Conf->ReadValue("badchan","name",j).c_str()))
+ if (match(cname, Conf->ReadValue("badchan","name",j)))
{
if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j))
{
@@ -104,7 +104,7 @@ class ModuleDenyChannels : public Module
for (int i = 0; i < Conf->Enumerate("goodchan"); i++)
{
- if (match(cname, Conf->ReadValue("goodchan", "name", i).c_str()))
+ if (match(cname, Conf->ReadValue("goodchan", "name", i)))
{
return 0;
}
diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index f51dfd992..7861823f1 100644
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -97,7 +97,7 @@ class ModuleHostChange : public Module
{
for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
{
- if (((match(user->MakeHost(),i->first.c_str(),true)) || (match(user->MakeHostIP(),i->first.c_str()))))
+ if (((match(user->MakeHost(), i->first, true)) || (match(user->MakeHostIP(), i->first))))
{
Host* h = i->second;
diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 95f27ee0d..a31069791 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -66,11 +66,10 @@ public:
chan->GetExt(ie->GetInfoKey(), list);
if (list)
{
- char mask[MAXBUF];
- snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
+ std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
for (modelist::iterator it = list->begin(); it != list->end(); it++)
{
- if(match(user->GetFullRealHost(), it->mask.c_str()) || match(user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
+ if(match(user->GetFullRealHost(), it->mask) || match(user->GetFullHost(), it->mask) || (match(mask, it->mask, true)))
{
// They match an entry on the list, so let them in.
return 1;
@@ -92,11 +91,10 @@ public:
LM->chan->GetExt(ie->GetInfoKey(), list);
if (list)
{
- char mask[MAXBUF];
- snprintf(mask, MAXBUF, "%s!%s@%s", LM->user->nick, LM->user->ident, LM->user->GetIPString());
+ std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString();
for (modelist::iterator it = list->begin(); it != list->end(); it++)
{
- if (match(LM->user->GetFullRealHost(), it->mask.c_str()) || match(LM->user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
+ if (match(LM->user->GetFullRealHost(), it->mask) || match(LM->user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask, true)))
{
// They match an entry
return (char*)it->mask.c_str();
diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 2e0212ded..e42d085cb 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -185,7 +185,7 @@ class ModuleSafeList : public Module
if ((chan) && (chan->modes[CM_PRIVATE]) && (!IS_OPER(user)))
{
- bool display = (match(chan->name, ld->glob.c_str()) || (*chan->topic && match(chan->topic, ld->glob.c_str())));
+ bool display = (match(chan->name, ld->glob) || (*chan->topic && match(chan->topic, ld->glob)));
if ((users) && (display))
{
int counter = snprintf(buffer, MAXBUF, "322 %s * %ld :", user->nick, users);
@@ -195,7 +195,7 @@ class ModuleSafeList : public Module
}
else if ((chan) && ((((!(chan->modes[CM_PRIVATE])) && (!(chan->modes[CM_SECRET])))) || (has_user) || IS_OPER(user)))
{
- bool display = (match(chan->name, ld->glob.c_str()) || (*chan->topic && match(chan->topic, ld->glob.c_str())));
+ bool display = (match(chan->name, ld->glob) || (*chan->topic && match(chan->topic, ld->glob)));
if ((users) && (display))
{
int counter = snprintf(buffer, MAXBUF, "322 %s %s %ld :[+%s] %s",user->nick, chan->name, users, chan->ChanModes(has_user || IS_OPER(user)), chan->topic);
diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index 7dc960c5a..755b3a58d 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -37,16 +37,15 @@ class CommandTline : public Command
for (user_hash::const_iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++)
{
n_counted++;
- if (match(u->second->GetFullRealHost(),parameters[0].c_str()))
+ if (match(u->second->GetFullRealHost(),parameters[0]))
{
n_matched++;
n_match_host++;
}
else
{
- char host[MAXBUF];
- snprintf(host, MAXBUF, "%s@%s", u->second->ident, u->second->GetIPString());
- if (match(host, parameters[0].c_str(), true))
+ std::string host = std::string(u->second->ident) + "@" + u->second->GetIPString();
+ if (match(host, parameters[0], true))
{
n_matched++;
n_match_ip++;
diff --git a/src/xline.cpp b/src/xline.cpp
index 1e2e415cd..1b56f2920 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -532,7 +532,7 @@ void QLine::Apply(User* u)
bool ZLine::Matches(const std::string &str)
{
- if (match(str.c_str(), this->ipaddr, true))
+ if (match(str, this->ipaddr, true))
return true;
else
return false;
@@ -540,7 +540,7 @@ bool ZLine::Matches(const std::string &str)
bool QLine::Matches(const std::string &str)
{
- if (match(str.c_str(), this->nick))
+ if (match(str, this->nick))
return true;
return false;
@@ -548,17 +548,17 @@ bool QLine::Matches(const std::string &str)
bool ELine::Matches(const std::string &str)
{
- return ((match(str.c_str(), matchtext.c_str(), true)));
+ return ((match(str, matchtext, true)));
}
bool KLine::Matches(const std::string &str)
{
- return ((match(str.c_str(), matchtext.c_str(), true)));
+ return ((match(str.c_str(), matchtext, true)));
}
bool GLine::Matches(const std::string &str)
{
- return ((match(str.c_str(), matchtext.c_str(), true)));
+ return ((match(str, matchtext, true)));
}
void ELine::OnAdd()
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 09:03:25 +0000