aboutsummaryrefslogtreecommitdiffstats
path: root/src/channels.cpp
diff options
context:
space:
mode:
authorGravatar w00t2008-02-11 09:41:58 +0000
committerGravatar w00t2008-02-11 09:41:58 +0000
commit5db1d322be106c8462dc691072f9415dc0766ed4 (patch)
tree311cb5e6d5307d3e2b77652a9a2461a324c5ab2e /src/channels.cpp
parentTidy up run-cc error reporting (eg: only say 'An error occured' once, and mak... (diff)
downloadinspircd++-5db1d322be106c8462dc691072f9415dc0766ed4.tar.gz
inspircd++-5db1d322be106c8462dc691072f9415dc0766ed4.tar.bz2
inspircd++-5db1d322be106c8462dc691072f9415dc0766ed4.zip
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/channels.cpp')
-rw-r--r--src/channels.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index cab05caeb..bb388e21e 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -18,14 +18,14 @@
#include "wildcard.h"
#include "mode.h"
-Channel::Channel(InspIRCd* Instance, const std::string &name, time_t ts) : ServerInstance(Instance)
+Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance)
{
chan_hash::iterator findchan = ServerInstance->chanlist->find(name);
if (findchan != Instance->chanlist->end())
- throw CoreException("Cannot create duplicate channel " + name);
+ throw CoreException("Cannot create duplicate channel " + cname);
- (*(ServerInstance->chanlist))[name.c_str()] = this;
- strlcpy(this->name, name.c_str(), CHANMAX);
+ (*(ServerInstance->chanlist))[cname.c_str()] = this;
+ strlcpy(this->name, cname.c_str(), CHANMAX);
this->created = ts ? ts : ServerInstance->Time(true);
this->age = this->created;