summaryrefslogtreecommitdiff
path: root/src/modes
diff options
context:
space:
mode:
authorattilamolnar <attilamolnar@hush.com>2012-11-28 02:37:49 +0100
committerattilamolnar <attilamolnar@hush.com>2012-11-28 19:28:52 +0100
commit2d2e0469b8ac7c64c9dc22f7074db8fc245e2f13 (patch)
tree6645e1002a23da05d3f651b1a341b75445c65992 /src/modes
parent790f8c35841ef7c9ec123242611613b540f14c2c (diff)
Change empty string assignments to .clear() or remove them entirely
Part 2 of ba5c0db795824c3fc1ad48ce332d7bdc440cb77f
Diffstat (limited to 'src/modes')
-rw-r--r--src/modes/cmode_b.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp
index 660b0c275..6bdd076f8 100644
--- a/src/modes/cmode_b.cpp
+++ b/src/modes/cmode_b.cpp
@@ -43,11 +43,11 @@ ModeAction ModeChannelBan::OnModeChange(User* source, User*, Channel* channel, s
/* Call the correct method depending on wether we're adding or removing the mode */
if (adding)
{
- parameter = this->AddBan(source, parameter, channel, status);
+ this->AddBan(source, parameter, channel, status);
}
else
{
- parameter = this->DelBan(source, parameter, channel, status);
+ this->DelBan(source, parameter, channel, status);
}
/* If the method above 'ate' the parameter by reducing it to an empty string, then
* it won't matter wether we return ALLOW or DENY here, as an empty string overrides
@@ -105,21 +105,21 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
if ((!user) || (!chan))
{
ServerInstance->Logs->Log("MODE",DEFAULT,"*** BUG *** AddBan was given an invalid parameter");
- dest = "";
+ dest.clear();
return dest;
}
/* Attempt to tidy the mask */
ModeParser::CleanMask(dest);
/* If the mask was invalid, we exit */
- if (dest == "" || dest.length() > 250)
+ if (dest.empty() || dest.length() > 250)
return dest;
long maxbans = chan->GetMaxBans();
if (IS_LOCAL(user) && ((unsigned)chan->bans.size() > (unsigned)maxbans))
{
user->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str(), maxbans);
- dest = "";
+ dest.clear();
return dest;
}
@@ -127,7 +127,7 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
FIRST_MOD_RESULT(OnAddBan, MOD_RESULT, (user,chan,dest));
if (MOD_RESULT == MOD_RES_DENY)
{
- dest = "";
+ dest.clear();
return dest;
}
@@ -136,7 +136,7 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan
if (i->data == dest)
{
/* dont allow a user to set the same ban twice */
- dest = "";
+ dest.clear();
return dest;
}
}
@@ -153,7 +153,7 @@ std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan
if ((!user) || (!chan))
{
ServerInstance->Logs->Log("MODE",DEFAULT,"*** BUG *** TakeBan was given an invalid parameter");
- dest = "";
+ dest.clear();
return dest;
}
@@ -165,14 +165,14 @@ std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan
FIRST_MOD_RESULT(OnDelBan, MOD_RESULT, (user, chan, dest));
if (MOD_RESULT == MOD_RES_DENY)
{
- dest = "";
+ dest.clear();
return dest;
}
chan->bans.erase(i);
return dest;
}
}
- dest = "";
+ dest.clear();
return dest;
}