diff options
author | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-02-11 09:41:58 +0000 |
---|---|---|
committer | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-02-11 09:41:58 +0000 |
commit | 5db1d322be106c8462dc691072f9415dc0766ed4 (patch) | |
tree | 311cb5e6d5307d3e2b77652a9a2461a324c5ab2e /include | |
parent | 0626e6a68af3327ecfda4467f2dd09d4e729773d (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 'include')
-rw-r--r-- | include/u_listmode.h | 16 | ||||
-rw-r--r-- | include/users.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/include/u_listmode.h b/include/u_listmode.h index b9a11af82..31f07148f 100644 --- a/include/u_listmode.h +++ b/include/u_listmode.h @@ -370,13 +370,13 @@ class ListModeBase : public ModeHandler */ virtual void DoChannelDelete(Channel* chan) { - modelist* list; - chan->GetExt(infokey, list); + modelist* mlist; + chan->GetExt(infokey, mlist); - if (list) + if (mlist) { chan->Shrink(infokey); - delete list; + delete mlist; } } @@ -388,13 +388,13 @@ class ListModeBase : public ModeHandler */ virtual void DoSyncChannel(Channel* chan, Module* proto, void* opaque) { - modelist* list; - chan->GetExt(infokey, list); + modelist* mlist; + chan->GetExt(infokey, mlist); irc::modestacker modestack(true); std::deque<std::string> stackresult; - if (list) + if (mlist) { - for (modelist::iterator it = list->begin(); it != list->end(); it++) + for (modelist::iterator it = mlist->begin(); it != mlist->end(); it++) { modestack.Push(std::string(1, mode)[0], assign(it->mask)); } diff --git a/include/users.h b/include/users.h index a7b6f5629..507fdf97b 100644 --- a/include/users.h +++ b/include/users.h @@ -207,7 +207,7 @@ public: */ void Update(unsigned int timeout, unsigned int fld, const std::string &hst, unsigned int ping, const std::string &pas, unsigned int thres, unsigned long sendq, unsigned long recvq, - unsigned long maxl, unsigned long maxg, unsigned int maxc, int p, unsigned long limit) + unsigned long maxl, unsigned long maxg, unsigned int maxc, int p, unsigned long llimit) { if (timeout) registration_timeout = timeout; @@ -234,7 +234,7 @@ public: if (p) port = p; - this->limit = limit; + this->limit = llimit; } /** Reference counter. Contains an int as to how many users are connected to this class. :) |