summaryrefslogtreecommitdiff
path: root/src/modules/m_filter.h
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-02-11 09:41:58 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-02-11 09:41:58 +0000
commit5db1d322be106c8462dc691072f9415dc0766ed4 (patch)
tree311cb5e6d5307d3e2b77652a9a2461a324c5ab2e /src/modules/m_filter.h
parent0626e6a68af3327ecfda4467f2dd09d4e729773d (diff)
Add -Wshadow to cflags, and fix a bunch of warnings that come with it. Add a note to webirc that needs looking at.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8892 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_filter.h')
-rw-r--r--src/modules/m_filter.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h
index 5bc41b136..130509682 100644
--- a/src/modules/m_filter.h
+++ b/src/modules/m_filter.h
@@ -36,10 +36,10 @@ class FilterResult : public classbase
bool flag_privmsg;
bool flag_notice;
- FilterResult(const std::string free, const std::string &rea, const std::string &act, long gt, const std::string &fla) : freeform(free), reason(rea),
- action(act), gline_time(gt), flags(fla)
+ FilterResult(const std::string free, const std::string &rea, const std::string &act, long gt, const std::string &fla) :
+ freeform(free), reason(rea), action(act), gline_time(gt), flags(fla)
{
- this->FillFlags(flags);
+ this->FillFlags(fla);
}
int FillFlags(const std::string &fl)
@@ -121,9 +121,9 @@ class CommandFilter : public Command
{
FilterBase* Base;
public:
- CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &source) : Command(Me, "FILTER", 'o', 1), Base(f)
+ CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &ssource) : Command(Me, "FILTER", 'o', 1), Base(f)
{
- this->source = source;
+ this->source = ssource;
this->syntax = "<filter-definition> <type> <flags> [<gline-duration>] :<reason>";
}
@@ -207,17 +207,17 @@ class CommandFilter : public Command
}
};
-bool FilterBase::AppliesToMe(User* user, FilterResult* filter, int flags)
+bool FilterBase::AppliesToMe(User* user, FilterResult* filter, int iflags)
{
if ((filter->flag_no_opers) && IS_OPER(user))
return false;
- if ((flags & FLAG_PRIVMSG) && (!filter->flag_privmsg))
+ if ((iflags & FLAG_PRIVMSG) && (!filter->flag_privmsg))
return false;
- if ((flags & FLAG_NOTICE) && (!filter->flag_notice))
+ if ((iflags & FLAG_NOTICE) && (!filter->flag_notice))
return false;
- if ((flags & FLAG_QUIT) && (!filter->flag_quit_message))
+ if ((iflags & FLAG_QUIT) && (!filter->flag_quit_message))
return false;
- if ((flags & FLAG_PART) && (!filter->flag_part_message))
+ if ((iflags & FLAG_PART) && (!filter->flag_part_message))
return false;
return true;
}