pedantic safe

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8316 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 32 insertions, 39 deletions

diff --git a/include/mode.h b/include/mode.h
index 2524c11dd..a787e4637 100644
--- a/include/mode.h
+++ b/include/mode.h
@@ -430,12 +430,10 @@ class CoreExport ModeParser : public classbase
 	 * @return Last parsed string, as seen by users.
 	 */
 	const std::string& GetLastParse();
-	/** Add a mode to the mode parser. The modeletter parameter
-	 * is purely to save on doing a lookup in the function, as
-	 * strictly it could be obtained via ModeHandler::GetModeChar().
+	/** Add a mode to the mode parser.
 	 * @return True if the mode was successfully added.
 	 */
-	bool AddMode(ModeHandler* mh, unsigned const char modeletter);
+	bool AddMode(ModeHandler* mh);
 	/** Delete a mode from the mode parser.
 	 * When a mode is deleted, the mode handler will be called
 	 * for every user (if it is a user mode) or for every  channel
diff --git a/src/mode.cpp b/src/mode.cpp
index 4aee282a2..2b31c725b 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -109,12 +109,12 @@ char ModeHandler::GetModeChar()
 	return mode;
 }
 
-ModeAction ModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool)
 {
 	return MODEACTION_DENY;
 }
 
-ModePair ModeHandler::ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
+ModePair ModeHandler::ModeSet(User*, User* dest, Channel* channel, const std::string&)
 {
 	if (dest)
 	{
@@ -126,15 +126,15 @@ ModePair ModeHandler::ModeSet(User* source, User* dest, Channel* channel, const
 	}
 }
 
-void ModeHandler::DisplayList(User* user, Channel* channel)
+void ModeHandler::DisplayList(User*, Channel*)
 {
 }
 
-void ModeHandler::DisplayEmptyList(User* user, Channel* channel)
+void ModeHandler::DisplayEmptyList(User*, Channel*)
 {
 }
 
-bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
+bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string&, const std::string&, Channel*)
 {
 	return (ours < theirs);
 }
@@ -157,16 +157,16 @@ ModeType ModeWatcher::GetModeType()
 	return m_type;
 }
 
-bool ModeWatcher::BeforeMode(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, ModeType type)
+bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType)
 {
 	return true;
 }
 
-void ModeWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string &parameter, bool adding, ModeType type)
+void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType)
 {
 }
 
-User* ModeParser::SanityChecks(User *user,const char *dest,Channel *chan,int status)
+User* ModeParser::SanityChecks(User *user, const char *dest, Channel *chan, int)
 {
 	User *d;
 	if ((!user) || (!dest) || (!chan) || (!*dest))
@@ -692,7 +692,7 @@ void ModeParser::CleanMask(std::string &mask)
 	}
 }
 
-bool ModeParser::AddMode(ModeHandler* mh, unsigned const char modeletter)
+bool ModeParser::AddMode(ModeHandler* mh)
 {
 	unsigned char mask = 0;
 	unsigned char pos = 0;
@@ -1030,31 +1030,26 @@ void ModeHandler::RemoveMode(Channel* channel)
 
 ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
 {
-	struct Initializer
+	ModeHandler* modes[] =
 	{
-		char modechar;
-		ModeHandler* handler;
-	};
-
-	Initializer modes[] = {
-		{ 's', new ModeChannelSecret(Instance) },
-		{ 'p', new ModeChannelPrivate(Instance) },
-		{ 'm', new ModeChannelModerated(Instance) },
-		{ 't', new ModeChannelTopicOps(Instance) },
-		{ 'n', new ModeChannelNoExternal(Instance) },
-		{ 'i', new ModeChannelInviteOnly(Instance) },
-		{ 'k', new ModeChannelKey(Instance) },
-		{ 'l', new ModeChannelLimit(Instance) },
-		{ 'b', new ModeChannelBan(Instance) },
-		{ 'o', new ModeChannelOp(Instance) },
-		{ 'h', new ModeChannelHalfOp(Instance) },
-		{ 'v', new ModeChannelVoice(Instance) },
-		{ 's', new ModeUserServerNotice(Instance) },
-		{ 'w', new ModeUserWallops(Instance) },
-		{ 'i', new ModeUserInvisible(Instance) },
-		{ 'o', new ModeUserOperator(Instance) },
-		{ 'n', new ModeUserServerNoticeMask(Instance) },
-		{ 0, NULL }
+		new ModeChannelSecret(Instance),
+		new ModeChannelPrivate(Instance),
+		new ModeChannelModerated(Instance),
+		new ModeChannelTopicOps(Instance),
+		new ModeChannelNoExternal(Instance),
+		new ModeChannelInviteOnly(Instance),
+		new ModeChannelKey(Instance),
+		new ModeChannelLimit(Instance),
+		new ModeChannelBan(Instance),
+		new ModeChannelOp(Instance),
+		new ModeChannelHalfOp(Instance),
+		new ModeChannelVoice(Instance),
+		new ModeUserServerNotice(Instance),
+		new ModeUserWallops(Instance),
+		new ModeUserInvisible(Instance),
+		new ModeUserOperator(Instance),
+		new ModeUserServerNoticeMask(Instance),
+		NULL
 	};
 
 	/* Clear mode list */
@@ -1065,6 +1060,6 @@ ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance)
 	LastParse.clear();
 
 	/* Initialise the RFC mode letters */
-	for (int index = 0; modes[index].modechar; index++)
-		this->AddMode(modes[index].handler, modes[index].modechar);
+	for (int index = 0; modes[index]; index++)
+		this->AddMode(modes[index]);
 }