Wheee, mass commit! this adds const stafety, throwing a compile error if anyone does: "parameters[n] = blahvar;" in a command handler etc. where they REALLY SHOULD NOT fuck with the value and should

copy the pointer.


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

include/command_parse.h

@@ -102,7 +102,7 @@ class CoreExport CommandParser : public classbase
 	 * command simply did not exist at all or the wrong number of parameters were given, or the user
 	 * was not privilaged enough to execute the command.
 	 */
-	CmdResult CallHandler(const std::string &commandname,const char** parameters, int pcnt, User *user);
+	CmdResult CallHandler(const std::string &commandname,const char* const* parameters, int pcnt, User *user);
 
 	/** Get the handler function for a command.
 	 * @param commandname The command required. Always use uppercase for this parameter.
@@ -141,7 +141,7 @@ class CoreExport CommandParser : public classbase
 	 * @return This function will return 1 when there are no more parameters to process. When this occurs, its
 	 * caller should return without doing anything, otherwise it should continue into its main section of code.
 	 */
-	int LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra);
+	int LoopCall(User* user, Command* CommandObj, const char* const* parameters, int pcnt, unsigned int splithere, unsigned int extra);
 
 	/** LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list.
 	 * There are two overriden versions of this method, one of which takes two potential lists and the other takes one.
@@ -164,7 +164,7 @@ class CoreExport CommandParser : public classbase
 	 * @return This function will return 1 when there are no more parameters to process. When this occurs, its
 	 * caller should return without doing anything, otherwise it should continue into its main section of code.
 	 */
-	int LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere);
+	int LoopCall(User* user, Command* CommandObj, const char* const* parameters, int pcnt, unsigned int splithere);
 
 	/** Take a raw input buffer from a recvq, and process it on behalf of a user.
 	 * @param buffer The buffer line to process
@@ -220,7 +220,7 @@ class cmd_reload : public Command
 	cmd_reload (InspIRCd* Instance) : Command(Instance,"RELOAD","o",1) { syntax = "<core-command>"; }
 	/** Handle RELOAD
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 /** A lookup table of values for multiplier characters used by

include/commands/cmd_admin.h

@@ -34,7 +34,7 @@ class CommandAdmin : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_away.h

@@ -36,7 +36,7 @@ class CommandAway : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_clearcache.h

@@ -35,7 +35,7 @@ class CommandClearcache : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_commands.h

@@ -36,7 +36,7 @@ class CommandCommands : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_connect.h

@@ -36,7 +36,7 @@ class CommandConnect : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_die.h

@@ -36,7 +36,7 @@ class CommandDie : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_eline.h

@@ -36,7 +36,7 @@ class CommandEline : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_gline.h

@@ -36,7 +36,7 @@ class CommandGline : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_info.h

@@ -36,7 +36,7 @@ class CommandInfo : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_invite.h

@@ -36,7 +36,7 @@ class CommandInvite : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_ison.h

@@ -36,7 +36,7 @@ class CommandIson : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_join.h

@@ -36,7 +36,7 @@ class CommandJoin : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_kick.h

@@ -36,7 +36,7 @@ class CommandKick : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_kill.h

@@ -36,7 +36,7 @@ class CommandKill : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_kline.h

@@ -36,7 +36,7 @@ class CommandKline : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_links.h

@@ -36,7 +36,7 @@ class CommandLinks : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_list.h

@@ -36,7 +36,7 @@ class CommandList : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_loadmodule.h

@@ -36,7 +36,7 @@ class CommandLoadmodule : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_lusers.h

@@ -36,7 +36,7 @@ class CommandLusers : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_map.h

@@ -36,7 +36,7 @@ class CommandMap : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_mode.h

@@ -35,7 +35,7 @@ class CommandMode : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_modules.h

@@ -36,7 +36,7 @@ class CommandModules : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_motd.h

@@ -39,7 +39,7 @@ class CommandMotd : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_names.h

@@ -36,7 +36,7 @@ class CommandNames : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_nick.h

@@ -37,7 +37,7 @@ class CommandNick : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 
 	/** Handle internal command
 	 * @param id Used to indicate if invalid nick changes are allowed.

include/commands/cmd_notice.h

@@ -36,7 +36,7 @@ class CommandNotice : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_oper.h

@@ -38,7 +38,7 @@ class CommandOper : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_part.h

@@ -36,7 +36,7 @@ class CommandPart : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_pass.h

@@ -39,7 +39,7 @@ class CommandPass : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_ping.h

@@ -36,7 +36,7 @@ class CommandPing : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_pong.h

@@ -37,7 +37,7 @@ class CommandPong : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_privmsg.h

@@ -36,7 +36,7 @@ class CommandPrivmsg : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_qline.h

@@ -36,7 +36,7 @@ class CommandQline : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_quit.h

@@ -36,7 +36,7 @@ class CommandQuit : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_rehash.h

@@ -36,7 +36,7 @@ class CommandRehash : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_reloadmodule.h

@@ -36,7 +36,7 @@ class CommandReloadmodule : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_restart.h

@@ -39,7 +39,7 @@ class CommandRestart : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_rules.h

@@ -39,7 +39,7 @@ class CommandRules : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_server.h

@@ -36,7 +36,7 @@ class CommandServer : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_squit.h

@@ -39,7 +39,7 @@ class CommandSquit : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_stats.h

@@ -39,7 +39,7 @@ class CommandStats : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_time.h

@@ -36,7 +36,7 @@ class CommandTime : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_topic.h

@@ -36,7 +36,7 @@ class CommandTopic : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_trace.h

@@ -36,7 +36,7 @@ class CommandTrace : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_unloadmodule.h

@@ -36,7 +36,7 @@ class CommandUnloadmodule : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_user.h

@@ -36,7 +36,7 @@ class CommandUser : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_userhost.h

@@ -36,7 +36,7 @@ class CommandUserhost : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_version.h

@@ -36,7 +36,7 @@ class CommandVersion : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_wallops.h

@@ -36,7 +36,7 @@ class CommandWallops : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_who.h

@@ -49,7 +49,7 @@ class CommandWho : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 	bool whomatch(User* user, const char* matchtext);
 };
 

include/commands/cmd_whois.h

@@ -39,7 +39,7 @@ class CommandWhois : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/commands/cmd_whowas.h

@@ -79,7 +79,7 @@ class CommandWhowas : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 	/** Handle an internal request from another command, the core, or a module
 	 * @param Command ID
 	 * @param Zero or more parameters, whos form is specified by the command ID.

include/commands/cmd_zline.h

@@ -36,7 +36,7 @@ class CommandZline : public Command
 	 * @param user The user issuing the command
 	 * @return A value from CmdResult to indicate command success or failure.
 	 */
-	CmdResult Handle(const char** parameters, int pcnt, User *user);
+	CmdResult Handle(const char* const* parameters, int pcnt, User *user);
 };
 
 #endif

include/ctables.h

@@ -113,7 +113,7 @@ class CoreExport Command : public Extensible
 	 * If the command succeeds but should remain local to this server,
 	 * return CMD_LOCALONLY.
 	 */
-	virtual CmdResult Handle(const char** parameters, int pcnt, User* user) = 0;
+	virtual CmdResult Handle(const char* const* parameters, int pcnt, User* user) = 0;
 
 	/** Handle an internal request from another command, the core, or a module
 	 * @param Command ID
@@ -136,7 +136,7 @@ class CoreExport Command : public Extensible
 	 * If the command succeeds but should remain local to this server,
 	 * return CMD_LOCALONLY.
 	 */
-	virtual CmdResult HandleServer(const char** /* parameters */, int /* pcnt */, const std::string& /* servername */)
+	virtual CmdResult HandleServer(const char* const* /* parameters */, int /* pcnt */, const std::string& /* servername */)
 	{
 		return CMD_INVALID;
 	}

include/hashcomp.h

@@ -129,7 +129,7 @@ namespace irc
 	/** irc::stringjoiner joins string lists into a string, using
 	 * the given seperator string.
 	 * This class can join a vector of std::string, a deque of
-	 * std::string, or a const char** array, using overloaded
+	 * std::string, or a const char* const* array, using overloaded
 	 * constructors.
 	 */
 	class CoreExport stringjoiner
@@ -159,7 +159,7 @@ namespace irc
 		 * @param begin The starting element in the sequence to be joined
 		 * @param end The ending element in the sequence to be joined
 		 */
-		stringjoiner(const std::string &seperator, const char** sequence, int begin, int end);
+		stringjoiner(const std::string &seperator, const char* const* sequence, int begin, int end);
 
 		/** Get the joined sequence
 		 * @return A reference to the joined string

include/inspircd.h

@@ -656,7 +656,7 @@ class CoreExport InspIRCd : public classbase
 	 * @param pcnt The number of items you have given in the first parameter
 	 * @param user The user to send error messages to
 	 */
-	void SendMode(const char **parameters, int pcnt, User *user);
+	void SendMode(const char* const* parameters, int pcnt, User *user);
 
 	/** Match two strings using pattern matching.
 	 * This operates identically to the global function match(),
@@ -674,7 +674,7 @@ class CoreExport InspIRCd : public classbase
 	 * @param user The user to execute the command as
 	 * @return True if the command handler was called successfully
 	 */
-	CmdResult CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, User* user);
+	CmdResult CallCommandHandler(const std::string &commandname, const char* const* parameters, int pcnt, User* user);
 
 	/** Return true if the command is a module-implemented command and the given parameters are valid for it
 	 * @param parameters The mode parameters

include/mode.h

@@ -467,7 +467,7 @@ class CoreExport ModeParser : public classbase
 	 * and *user->server == NULL.
 	 * @param servermode True if a server is setting the mode.
 	 */
-	void Process(const char** parameters, int pcnt, User *user, bool servermode);
+	void Process(const char* const* parameters, int pcnt, User *user, bool servermode);
 
 	/** Find the mode handler for a given mode and type.
 	 * @param modeletter mode letter to search for

include/modules.h

@@ -1044,7 +1044,7 @@ class CoreExport Module : public Extensible
 	 * @param original_line The entire original line as passed to the parser from the user
 	 * @return 1 to block the command, 0 to allow
 	 */
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line);
+	virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line);
 
 	/** Called after any command has been executed.
 	 * This event occurs for all registered commands, wether they are registered in the core,
@@ -1058,7 +1058,7 @@ class CoreExport Module : public Extensible
 	 * @param result The return code given by the command handler, one of CMD_SUCCESS or CMD_FAILURE
 	 * @param original_line The entire original line as passed to the parser from the user
 	 */
-	virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line);
+	virtual void OnPostCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, CmdResult result, const std::string &original_line);
 
 	/** Called to check if a user who is connecting can now be allowed to register
 	 * If any modules return false for this function, the user is held in the waiting

src/command_parse.cpp

@@ -48,7 +48,7 @@ int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, co
  * The second version is much simpler and just has the one stream to read, and is used in NAMES, WHOIS, PRIVMSG etc.
  * Both will only parse until they reach ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam.
  */
-int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra)
+int CommandParser::LoopCall(User* user, Command* CommandObj, const char* const* parameters, int pcnt, unsigned int splithere, unsigned int extra)
 {
 	/* First check if we have more than one item in the list, if we don't we return zero here and the handler
 	 * which called us just carries on as it was.
@@ -97,7 +97,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parame
 	return 1;
 }
 
-int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere)
+int CommandParser::LoopCall(User* user, Command* CommandObj, const char* const* parameters, int pcnt, unsigned int splithere)
 {
 	/* First check if we have more than one item in the list, if we don't we return zero here and the handler
 	 * which called us just carries on as it was.
@@ -178,7 +178,7 @@ Command* CommandParser::GetHandler(const std::string &commandname)
 
 // calls a handler function for a command
 
-CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, User *user)
+CmdResult CommandParser::CallHandler(const std::string &commandname,const char* const* parameters, int pcnt, User *user)
 {
 	Commandable::iterator n = cmdlist.find(commandname);
 
@@ -498,7 +498,7 @@ bool CommandParser::ReloadCommand(const char* cmd, User* user)
 	return false;
 }
 
-CmdResult cmd_reload::Handle(const char** parameters, int /* pcnt */, User *user)
+CmdResult cmd_reload::Handle(const char* const* parameters, int /* pcnt */, User *user)
 {
 	user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]);
 	if (ServerInstance->Parser->ReloadCommand(parameters[0], user))

src/commands/cmd_admin.cpp

@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /ADMIN
  */
-CmdResult CommandAdmin::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandAdmin::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	user->WriteServ("256 %s :Administrative info for %s",user->nick,ServerInstance->Config->ServerName);
 	if (*ServerInstance->Config->AdminName)

src/commands/cmd_away.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /AWAY
  */
-CmdResult CommandAway::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandAway::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	if ((pcnt) && (*parameters[0]))
 	{

src/commands/cmd_clearcache.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /CLEARCACHE
  */
-CmdResult CommandClearcache::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandClearcache::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	int n = ServerInstance->Res->ClearCache();
 	user->WriteServ("NOTICE %s :*** Cleared DNS cache of %d items.", user->nick, n);

src/commands/cmd_commands.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandCommands(Instance);
 }
 
-CmdResult CommandCommands::Handle (const char**, int, User *user)
+CmdResult CommandCommands::Handle (const char* const*, int, User *user)
 {
 	for (Commandable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++)
 	{

src/commands/cmd_connect.cpp

@@ -25,7 +25,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /CONNECT
  */
-CmdResult CommandConnect::Handle (const char**, int, User *user)
+CmdResult CommandConnect::Handle (const char* const*, int, User *user)
 {
 	user->WriteServ( "NOTICE %s :Look into loading a linking module (like m_spanningtree) if you want this to do anything useful.", user->nick);
 	return CMD_SUCCESS;

src/commands/cmd_die.cpp

@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /DIE
  */
-CmdResult CommandDie::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandDie::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	if (!ServerInstance->PassCompare(user, ServerInstance->Config->diepass, parameters[0], ServerInstance->Config->powerhash))
 	{

src/commands/cmd_eline.cpp

@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /ELINE
  */
-CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandEline::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	std::string target = parameters[0];
 	

src/commands/cmd_gline.cpp

@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /GLINE
  */
-CmdResult CommandGline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandGline::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	std::string target = parameters[0];
 		

src/commands/cmd_info.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /INFO
  */
-CmdResult CommandInfo::Handle (const char**, int, User *user)
+CmdResult CommandInfo::Handle (const char* const*, int, User *user)
 {
 	user->WriteServ( "371 %s :                   -/\\- \2InspIRCd\2 -\\/-", user->nick);
 	user->WriteServ( "371 %s :                 November 2002 - Present", user->nick);

src/commands/cmd_invite.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /INVITE
  */
-CmdResult CommandInvite::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandInvite::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	int MOD_RESULT = 0;
 

src/commands/cmd_ison.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /ISON
  */
-CmdResult CommandIson::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandIson::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	std::map<User*,User*> ison_already;
 	User *u;

src/commands/cmd_join.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /JOIN
  */
-CmdResult CommandJoin::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandJoin::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	if (pcnt > 1)
 	{

src/commands/cmd_kick.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /KICK
  */
-CmdResult CommandKick::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandKick::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	char reason[MAXKICK];
 	Channel* c = ServerInstance->FindChan(parameters[0]);

src/commands/cmd_kill.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /KILL
  */
-CmdResult CommandKill::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandKill::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	/* Allow comma seperated lists of users for /KILL (thanks w00t) */
 	if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))

src/commands/cmd_kline.cpp

@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /KLINE
  */
-CmdResult CommandKline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandKline::Handle (const char* const* parameters, int pcnt, User *user)
 {
     std::string target = parameters[0];
 

src/commands/cmd_links.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /LINKS
  */
-CmdResult CommandLinks::Handle (const char**, int, User *user)
+CmdResult CommandLinks::Handle (const char* const*, int, User *user)
 {
 	user->WriteServ("364 %s %s %s :0 %s",user->nick,ServerInstance->Config->ServerName,ServerInstance->Config->ServerName,ServerInstance->Config->ServerDesc);
 	user->WriteServ("365 %s * :End of /LINKS list.",user->nick);

src/commands/cmd_list.cpp

@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandList(Instance);
 }
 
-CmdResult CommandList::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandList::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	int minusers = 0, maxusers = 0;
 

src/commands/cmd_loadmodule.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /LOADMODULE
  */
-CmdResult CommandLoadmodule::Handle (const char** parameters, int, User *user)
+CmdResult CommandLoadmodule::Handle (const char* const* parameters, int, User *user)
 {
 	if (ServerInstance->Modules->Load(parameters[0]))
 	{

src/commands/cmd_lusers.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /LUSERS
  */
-CmdResult CommandLusers::Handle (const char**, int, User *user)
+CmdResult CommandLusers::Handle (const char* const*, int, User *user)
 {
 	// this lusers command shows one server at all times because
 	// a protocol module must override it to show those stats.

src/commands/cmd_map.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /MAP
  */
-CmdResult CommandMap::Handle (const char**, int, User *user)
+CmdResult CommandMap::Handle (const char* const*, int, User *user)
 {
 	// as with /LUSERS this does nothing without a linking
 	// module to override its behaviour and display something

src/commands/cmd_mode.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /MODE
  */
-CmdResult CommandMode::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandMode::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	ServerInstance->Modes->Process(parameters, pcnt, user, false);
 	return CMD_SUCCESS;

src/commands/cmd_modules.cpp

@@ -38,7 +38,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /MODULES
  */
-CmdResult CommandModules::Handle (const char**, int, User *user)
+CmdResult CommandModules::Handle (const char* const*, int, User *user)
 {
 	std::vector<std::string> module_names = ServerInstance->Modules->GetAllModuleNames(0);
 

src/commands/cmd_motd.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /MOTD
  */
-CmdResult CommandMotd::Handle (const char**, int, User *user)
+CmdResult CommandMotd::Handle (const char* const*, int, User *user)
 {
 	user->ShowMOTD();
 	return CMD_SUCCESS;

src/commands/cmd_names.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /NAMES
  */
-CmdResult CommandNames::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandNames::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	Channel* c;
 

src/commands/cmd_nick.cpp

@@ -25,7 +25,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
  * for the client introduction code in here, youre in the wrong place.
  * You need to look in the spanningtree module for this!
  */
-CmdResult CommandNick::Handle (const char** parameters, int, User *user)
+CmdResult CommandNick::Handle (const char* const* parameters, int, User *user)
 {
 	char oldnick[NICKMAX];
 

src/commands/cmd_notice.cpp

@@ -20,7 +20,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandNotice(Instance);
 }
 
-CmdResult CommandNotice::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandNotice::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	User *dest;
 	Channel *chan;
@@ -38,26 +38,27 @@ CmdResult CommandNotice::Handle (const char** parameters, int pcnt, User *user)
 		FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0,exempt_list));
 		if (MOD_RESULT)
 			return CMD_FAILURE;
-		parameters[1] = temp.c_str();
-		// notice to server mask
+		const char* text = temp.c_str();
 		const char* servermask = parameters[0] + 1;
-		FOREACH_MOD(I_OnText,OnText(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,exempt_list));
+
+		FOREACH_MOD(I_OnText,OnText(user,(void*)parameters[0],TYPE_SERVER,text,0,exempt_list));
 		if (match(ServerInstance->Config->ServerName,servermask))
 		{
-			user->SendAll("NOTICE", "%s", parameters[1]);
+			user->SendAll("NOTICE", "%s", text);
 		}
-		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,exempt_list));
+		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,text,0,exempt_list));
 		return CMD_SUCCESS;
 	}
 	char status = 0;
-	if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
+	const char* target = parameters[0];
+	if ((*target == '@') || (*target == '%') || (*target == '+'))
 	{
-		status = *parameters[0];
-		parameters[0]++;
+		status = *target;
+		target++;
 	}
-	if (*parameters[0] == '#')
+	if (*target == '#')
 	{
-		chan = ServerInstance->FindChan(parameters[0]);
+		chan = ServerInstance->FindChan(target);
 
 		exempt_list[user] = user->nick;
 
@@ -83,7 +84,7 @@ CmdResult CommandNotice::Handle (const char** parameters, int pcnt, User *user)
 			if (MOD_RESULT) {
 				return CMD_FAILURE;
 			}
-			parameters[1] = temp.c_str();
+			const char* text = temp.c_str();
 
 			if (temp.empty())
 			{
@@ -91,30 +92,30 @@ CmdResult CommandNotice::Handle (const char** parameters, int pcnt, User *user)
 				return CMD_FAILURE;
 			}
 
-			FOREACH_MOD(I_OnText,OnText(user,chan,TYPE_CHANNEL,parameters[1],status,exempt_list));
+			FOREACH_MOD(I_OnText,OnText(user,chan,TYPE_CHANNEL,text,status,exempt_list));
 
 			if (status)
 			{
 				if (ServerInstance->Config->UndernetMsgPrefix)
 				{
-					chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name, status, parameters[1]);
+					chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%c %s", status, chan->name, status, text);
 				}
 				else
 				{
-					chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%s", status, chan->name, parameters[1]);
+					chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %c%s :%s", status, chan->name, text);
 				}
 			}
 			else
 			{
-				chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %s :%s", chan->name, parameters[1]);
+				chan->WriteAllExcept(user, false, status, exempt_list, "NOTICE %s :%s", chan->name, text);
 			}
 
-			FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1],status,exempt_list));
+			FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,text,status,exempt_list));
 		}
 		else
 		{
 			/* no such nick/channel */
-			user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+			user->WriteServ("401 %s %s :No such nick/channel",user->nick, target);
 			return CMD_FAILURE;
 		}
 		return CMD_SUCCESS;
@@ -158,17 +159,17 @@ CmdResult CommandNotice::Handle (const char** parameters, int pcnt, User *user)
 		if (MOD_RESULT) {
 			return CMD_FAILURE;
 		}
-		parameters[1] = (char*)temp.c_str();
+		const char* text = temp.c_str();
 
-		FOREACH_MOD(I_OnText,OnText(user,dest,TYPE_USER,parameters[1],0,exempt_list));
+		FOREACH_MOD(I_OnText,OnText(user,dest,TYPE_USER,text,0,exempt_list));
 
 		if (IS_LOCAL(dest))
 		{
 			// direct write, same server
-			user->WriteTo(dest, "NOTICE %s :%s", dest->nick, parameters[1]);
+			user->WriteTo(dest, "NOTICE %s :%s", dest->nick, text);
 		}
 
-		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1],0,exempt_list));
+		FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,text,0,exempt_list));
 	}
 	else
 	{

src/commands/cmd_oper.cpp

@@ -35,7 +35,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandOper(Instance);
 }
 
-CmdResult CommandOper::Handle (const char** parameters, int, User *user)
+CmdResult CommandOper::Handle (const char* const* parameters, int, User *user)
 {
 	char LoginName[MAXBUF];
 	char Password[MAXBUF];

src/commands/cmd_part.cpp

@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandPart(Instance);
 }
 
-CmdResult CommandPart::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandPart::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	std::string reason;
 

src/commands/cmd_pass.cpp

@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandPass(Instance);
 }
 
-CmdResult CommandPass::Handle (const char** parameters, int, User *user)
+CmdResult CommandPass::Handle (const char* const* parameters, int, User *user)
 {
 	// Check to make sure they havnt registered -- Fix by FCS
 	if (user->registered == REG_ALL)

src/commands/cmd_ping.cpp

@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandPing(Instance);
 }
 
-CmdResult CommandPing::Handle (const char** parameters, int, User *user)
+CmdResult CommandPing::Handle (const char* const* parameters, int, User *user)
 {
 	user->WriteServ("PONG %s :%s",ServerInstance->Config->ServerName,parameters[0]);
 	return CMD_SUCCESS;

src/commands/cmd_pong.cpp

@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandPong(Instance);
 }
 
-CmdResult CommandPong::Handle (const char**, int, User *user)
+CmdResult CommandPong::Handle (const char* const*, int, User *user)
 {
 	// set the user as alive so they survive to next ping
 	user->lastping = 1;

src/commands/cmd_privmsg.cpp

@@ -20,7 +20,7 @@ extern "C" DllExport  Command* init_command(InspIRCd* Instance)
 	return new CommandPrivmsg(Instance);
 }
 
-CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandPrivmsg::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	User *dest;
 	Channel *chan;
@@ -38,26 +38,26 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
 		FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,(void*)parameters[0],TYPE_SERVER,temp,0,except_list));
 		if (MOD_RESULT)
 			return CMD_FAILURE;
-		parameters[1] = temp.c_str();
-		// notice to server mask
+		const char* text = temp.c_str();
 		const char* servermask = parameters[0] + 1;
-		FOREACH_MOD(I_OnText,OnText(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,except_list));
+		FOREACH_MOD(I_OnText,OnText(user,(void*)parameters[0],TYPE_SERVER,text,0,except_list));
 		if (match(ServerInstance->Config->ServerName,servermask))
 		{
-			user->SendAll("PRIVMSG", "%s", parameters[1]);
+			user->SendAll("PRIVMSG", "%s", text);
 		}
-		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0,except_list));
+		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,(void*)parameters[0],TYPE_SERVER,text,0,except_list));
 		return CMD_SUCCESS;
 	}
 	char status = 0;
-	if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+'))
+	const char* target = parameters[0];
+	if ((*target == '@') || (*target == '%') || (*target == '+'))
 	{
-		status = *parameters[0];
-		parameters[0]++;
+		status = *target;
+		target++;
 	}
-	if (parameters[0][0] == '#')
+	if (*target == '#')
 	{
-		chan = ServerInstance->FindChan(parameters[0]);
+		chan = ServerInstance->FindChan(target);
 
 		except_list[user] = user->nick;
 
@@ -83,7 +83,7 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
 			if (MOD_RESULT) {
 				return CMD_FAILURE;
 			}
-			parameters[1] = temp.c_str();
+			const char* text = temp.c_str();
 
 			/* Check again, a module may have zapped the input string */
 			if (temp.empty())
@@ -92,30 +92,30 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
 				return CMD_FAILURE;
 			}
 
-			FOREACH_MOD(I_OnText,OnText(user,chan,TYPE_CHANNEL,parameters[1],status,except_list));
+			FOREACH_MOD(I_OnText,OnText(user,chan,TYPE_CHANNEL,text,status,except_list));
 
 			if (status)
 			{
 				if (ServerInstance->Config->UndernetMsgPrefix)
 				{
-					chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name, status, parameters[1]);
+					chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%c %s", status, chan->name, status, text);
 				}
 				else
 				{
-					chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%s", status, chan->name, parameters[1]);
+					chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %c%s :%s", status, chan->name, text);
 				}
 			}
 			else 
 			{
-				chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %s :%s", chan->name, parameters[1]);
+				chan->WriteAllExcept(user, false, status, except_list, "PRIVMSG %s :%s", chan->name, text);
 			}
 
-			FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,parameters[1],status,except_list));
+			FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,chan,TYPE_CHANNEL,text,status,except_list));
 		}
 		else
 		{
 			/* no such nick/channel */
-			user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
+			user->WriteServ("401 %s %s :No such nick/channel",user->nick, target);
 			return CMD_FAILURE;
 		}
 		return CMD_SUCCESS;
@@ -166,17 +166,17 @@ CmdResult CommandPrivmsg::Handle (const char** parameters, int pcnt, User *user)
 		if (MOD_RESULT) {
 			return CMD_FAILURE;
 		}
-		parameters[1] = (char*)temp.c_str();
+		const char* text = temp.c_str();
 
-		FOREACH_MOD(I_OnText,OnText(user,dest,TYPE_USER,parameters[1],0,except_list));
+		FOREACH_MOD(I_OnText,OnText(user,dest,TYPE_USER,text,0,except_list));
 
 		if (IS_LOCAL(dest))
 		{
 			// direct write, same server
-			user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, parameters[1]);
+			user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, text);
 		}
 
-		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0,except_list));
+		FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,text,0,except_list));
 	}
 	else
 	{

src/commands/cmd_qline.cpp

@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandQline(Instance);
 }
 
-CmdResult CommandQline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandQline::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	if (pcnt >= 3)
 	{

src/commands/cmd_quit.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandQuit(Instance);
 }
 
-CmdResult CommandQuit::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandQuit::Handle (const char* const* parameters, int pcnt, User *user)
 {
 
 	std::string quitmsg;

src/commands/cmd_rehash.cpp

@@ -22,7 +22,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandRehash(Instance);
 }
 
-CmdResult CommandRehash::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandRehash::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	user->WriteServ("382 %s %s :Rehashing",user->nick,ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
 	std::string parameter;

src/commands/cmd_reloadmodule.cpp

@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandReloadmodule(Instance);
 }
 
-CmdResult CommandReloadmodule::Handle (const char** parameters, int, User *user)
+CmdResult CommandReloadmodule::Handle (const char* const* parameters, int, User *user)
 {
 	if (ServerInstance->Modules->Unload(parameters[0]))
 	{

src/commands/cmd_restart.cpp

@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandRestart(Instance);
 }
 
-CmdResult CommandRestart::Handle (const char** parameters, int, User *user)
+CmdResult CommandRestart::Handle (const char* const* parameters, int, User *user)
 {
 	ServerInstance->Log(DEFAULT,"Restart: %s",user->nick);
 	if (!ServerInstance->PassCompare(user, ServerInstance->Config->restartpass, parameters[0], ServerInstance->Config->powerhash))

src/commands/cmd_rules.cpp

@@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandRules(Instance);
 }
 
-CmdResult CommandRules::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandRules::Handle (const char* const* parameters, int pcnt, User *user)
 {
 	user->ShowRULES();
 	return CMD_SUCCESS;

src/commands/cmd_server.cpp

@@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandServer(Instance);
 }
 
-CmdResult CommandServer::Handle (const char**, int, User *user)
+CmdResult CommandServer::Handle (const char* const*, int, User *user)
 {
 	user->WriteServ("666 %s :You cannot identify as a server, you are a USER. IRC Operators informed.",user->nick);
 	ServerInstance->SNO->WriteToSnoMask('A', "WARNING: %s attempted to issue a SERVER command and is registered as a user!", user->nick);

src/commands/cmd_squit.cpp

@@ -24,7 +24,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 	return new CommandSquit(Instance);
 }
 
-CmdResult CommandSquit::Handle (const char**, int, User *user)
+CmdResult CommandSquit::Handle (const char* const*, int, User *user)
 {
 	user->WriteServ( "NOTICE %s :Look into loading a linking module (like m_spanningtree) if you want this to do anything useful.", user->nick);
 	return CMD_FAILURE;