Fix set-but-not-used and var shadowing warnings

inspircd · Jun 13, 2012 · 26b1532 · 26b1532
1 parent ba9366e
commit 26b1532
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/src/channels.cpp b/src/channels.cpp
@@ -917,12 +917,12 @@ void Channel::UserList(User *user, CUList *ulist)
 		if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
 			continue;
 
-		std::string prefixlist = this->GetPrefixChar(i->first);
+		std::string prelist = this->GetPrefixChar(i->first);
 		std::string nick = i->first->nick;
 
 		if (call_modules)
 		{
-			FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->first, this, prefixlist, nick));
+			FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->first, this, prelist, nick));
 
 			/* Nick was nuked, a module wants us to skip it */
 			if (nick.empty())
@@ -931,7 +931,7 @@ void Channel::UserList(User *user, CUList *ulist)
 
 		size_t ptrlen = 0;
 
-		if (curlen + prefixlist.length() + nick.length() + 1 > 480)
+		if (curlen + prelist.length() + nick.length() + 1 > 480)
 		{
 			/* list overflowed into multiple numerics */
 			user->WriteNumeric(RPL_NAMREPLY, std::string(list));
@@ -944,7 +944,7 @@ void Channel::UserList(User *user, CUList *ulist)
 			numusers = 0;
 		}
 
-		ptrlen = snprintf(ptr, MAXBUF, "%s%s ", prefixlist.c_str(), nick.c_str());
+		ptrlen = snprintf(ptr, MAXBUF, "%s%s ", prelist.c_str(), nick.c_str());
 
 		curlen += ptrlen;
 		ptr += ptrlen;

diff --git a/src/configreader.cpp b/src/configreader.cpp
@@ -1532,7 +1532,6 @@ bool ServerConfig::ParseLine(const std::string &filename, std::string &line, lon
 	std::string current_key;
 	std::string current_value;
 	KeyValList results;
-	char last_char = 0;
 	bool got_name;
 	bool got_key;
 	bool in_quote;
@@ -1661,10 +1660,7 @@ bool ServerConfig::ParseLine(const std::string &filename, std::string &line, lon
 				else
 				{
 					if (in_quote)
-					{
-						last_char = *c;
 						current_value += *c;
-					}
 				}
 			}
 		}

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
@@ -50,13 +50,13 @@ void TreeSocket::SendCapabilities()
 		return;
 
 	sentcapab = true;
-	irc::commasepstream modulelist(MyCapabilities());
+	irc::commasepstream modlist(MyCapabilities());
 	this->WriteLine("CAPAB START");
 
 	/* Send module names, split at 509 length */
 	std::string item;
 	std::string line = "CAPAB MODULES ";
-	while (modulelist.GetToken(item))
+	while (modlist.GetToken(item))
 	{
 		if (line.length() + item.length() + 1 > 509)
 		{

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
@@ -85,7 +85,6 @@ void ProcessUserHandler::Call(User* cu)
 	if ((result) && (result != -EAGAIN))
 	{
 		User *current;
-		int currfd;
 
 		Server->stats->statsRecv += result;
 		/*
@@ -103,7 +102,6 @@ void ProcessUserHandler::Call(User* cu)
 			ReadBuffer[result] = '\0';
 
 		current = cu;
-		currfd = current->GetFd();
 
 		// add the data to the users buffer
 		if (result > 0)