From 5db1d322be106c8462dc691072f9415dc0766ed4 Mon Sep 17 00:00:00 2001 From: w00t Date: Mon, 11 Feb 2008 09:41:58 +0000 Subject: 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 --- src/configreader.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/configreader.cpp') diff --git a/src/configreader.cpp b/src/configreader.cpp index f083f7895..9f7a59885 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -583,11 +583,11 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) */ for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item) { - ConnectClass* c = *item; - if ((*name && (c->GetName() == name)) || (*allow && (c->GetHost() == allow)) || (*deny && (c->GetHost() == deny))) + ConnectClass* cc = *item; + if ((*name && (cc->GetName() == name)) || (*allow && (cc->GetHost() == allow)) || (*deny && (cc->GetHost() == deny))) { /* reenable class so users can be shoved into it :P */ - c->SetDisabled(false); + cc->SetDisabled(false); conf->GetInstance()->Log(DEFAULT, "Not adding class, it already exists!"); return true; } @@ -603,11 +603,11 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) ClassVector::iterator item = conf->Classes.begin(); for (; item != conf->Classes.end(); ++item) { - ConnectClass* c = *item; - conf->GetInstance()->Log(DEBUG,"Class: %s", c->GetName().c_str()); - if (c->GetName() == parent) + ConnectClass* cc = *item; + conf->GetInstance()->Log(DEBUG,"Class: %s", cc->GetName().c_str()); + if (cc->GetName() == parent) { - ConnectClass* newclass = new ConnectClass(name, c); + ConnectClass* newclass = new ConnectClass(name, cc); newclass->Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit); conf->Classes.push_back(newclass); break; @@ -620,16 +620,16 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*) { if (*allow) { - ConnectClass* c = new ConnectClass(name, timeout, flood, allow, pingfreq, password, hashtype, threshold, sendq, recvq, localmax, globalmax, maxchans); - c->limit = limit; - c->SetPort(port); - conf->Classes.push_back(c); + ConnectClass* cc = new ConnectClass(name, timeout, flood, allow, pingfreq, password, hashtype, threshold, sendq, recvq, localmax, globalmax, maxchans); + cc->limit = limit; + cc->SetPort(port); + conf->Classes.push_back(cc); } else { - ConnectClass* c = new ConnectClass(name, deny); - c->SetPort(port); - conf->Classes.push_back(c); + ConnectClass* cc = new ConnectClass(name, deny); + cc->SetPort(port); + conf->Classes.push_back(cc); } } -- cgit v1.2.3