summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-04-26 13:00:51 +0200
committerAttila Molnar <attilamolnar@hush.com>2014-04-26 13:00:51 +0200
commitf09a9b3ea537f17ee52337773a5eba321ff1ccd7 (patch)
tree6648632d8598715ffa03317afa77b759c491036f /src
parent5b3bc00fb410f49d341013979937c1d82f6a9b24 (diff)
Remove redundant IS_LOCAL() checks discovered by static asserts
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_filter.cpp2
-rw-r--r--src/modules/m_ident.cpp2
-rw-r--r--src/modules/m_operlog.cpp2
-rw-r--r--src/modules/m_override.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index bfec54059..9acce033a 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -377,7 +377,7 @@ ModResult ModuleFilter::OnUserPreMessage(User* user, void* dest, int target_type
ModResult ModuleFilter::OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
{
- if (validated && IS_LOCAL(user))
+ if (validated)
{
flags = 0;
bool parting;
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 57944737c..1e01806b8 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -296,7 +296,7 @@ class ModuleIdent : public Module
try
{
- IdentRequestSocket *isock = new IdentRequestSocket(IS_LOCAL(user));
+ IdentRequestSocket *isock = new IdentRequestSocket(user);
ext.set(user, isock);
}
catch (ModuleException &e)
diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index e89dda7b5..d015d5ead 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -47,7 +47,7 @@ class ModuleOperLog : public Module
if (!validated)
return MOD_RES_PASSTHRU;
- if ((user->IsOper()) && (IS_LOCAL(user)) && (user->HasPermission(command)))
+ if ((user->IsOper()) && (user->HasPermission(command)))
{
Command* thiscommand = ServerInstance->Parser->GetHandler(command);
if ((thiscommand) && (thiscommand->flags_needed == 'o'))
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 04c5166c0..756ef8edc 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -161,7 +161,7 @@ class ModuleOverride : public Module
{
if (chan->IsModeSet(inviteonly) && (CanOverride(user,"INVITE")))
{
- if (!IS_LOCAL(user)->IsInvited(chan))
+ if (!user->IsInvited(chan))
return HandleJoinOverride(user, chan, keygiven, "invite-only", "+i");
return MOD_RES_ALLOW;
}