Slight API tweak. Change Command to take char * instead of char in it's constructor, this avoids confusion/generates a compile error if someone mixes up flags with number of params, instead of working but not working as expected in a weird manner.

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

19 files changed, 20 insertions, 20 deletions

diff --git a/include/command_parse.h b/include/command_parse.h
index 13b70997b..25d334dbf 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -217,7 +217,7 @@ class cmd_reload : public Command
  public:
 	/** Standard constructor
 	 */
-	cmd_reload (InspIRCd* Instance) : Command(Instance,"RELOAD",'o',1) { syntax = "<core-command>"; }
+	cmd_reload (InspIRCd* Instance) : Command(Instance,"RELOAD","o",1) { syntax = "<core-command>"; }
 	/** Handle RELOAD
 	 */
 	CmdResult Handle(const char** parameters, int pcnt, User *user);
diff --git a/include/commands/cmd_clearcache.h b/include/commands/cmd_clearcache.h
index e88a61822..d3435391a 100644
--- a/include/commands/cmd_clearcache.h
+++ b/include/commands/cmd_clearcache.h
@@ -28,7 +28,7 @@ class CommandClearcache : public Command
  public:
 	/** Constructor for clearcache.
 	 */
-	CommandClearcache (InspIRCd* Instance) : Command(Instance,"CLEARCACHE",'o',0) { }
+	CommandClearcache (InspIRCd* Instance) : Command(Instance,"CLEARCACHE","o",0) { }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_connect.h b/include/commands/cmd_connect.h
index 791b2eebe..907108a13 100644
--- a/include/commands/cmd_connect.h
+++ b/include/commands/cmd_connect.h
@@ -29,7 +29,7 @@ class CommandConnect : public Command
  public:
 	/** Constructor for connect.
 	 */
-	CommandConnect (InspIRCd* Instance) : Command(Instance,"CONNECT",'o',1,false,0) { syntax = "<servername> [<remote-server>]"; }
+	CommandConnect (InspIRCd* Instance) : Command(Instance,"CONNECT","o",1,false,0) { syntax = "<servername> [<remote-server>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_die.h b/include/commands/cmd_die.h
index 3713a9bbf..903fa8a25 100644
--- a/include/commands/cmd_die.h
+++ b/include/commands/cmd_die.h
@@ -29,7 +29,7 @@ class CommandDie : public Command
  public:
 	/** Constructor for die.
 	 */
-	CommandDie (InspIRCd* Instance) : Command(Instance,"DIE",'o',1,false,0) { syntax = "<password>"; }
+	CommandDie (InspIRCd* Instance) : Command(Instance,"DIE","o",1,false,0) { syntax = "<password>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_eline.h b/include/commands/cmd_eline.h
index fe0acc8eb..0bcfbfc96 100644
--- a/include/commands/cmd_eline.h
+++ b/include/commands/cmd_eline.h
@@ -29,7 +29,7 @@ class CommandEline : public Command
  public:
 	/** Constructor for eline.
 	 */
-	CommandEline (InspIRCd* Instance) : Command(Instance,"ELINE",'o',1,false,0) { syntax = "<ident@host> [<duration> :<reason>]"; }
+	CommandEline (InspIRCd* Instance) : Command(Instance,"ELINE","o",1,false,0) { syntax = "<ident@host> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_gline.h b/include/commands/cmd_gline.h
index c342bc28b..11e67448a 100644
--- a/include/commands/cmd_gline.h
+++ b/include/commands/cmd_gline.h
@@ -29,7 +29,7 @@ class CommandGline : public Command
  public:
 	/** Constructor for gline.
 	 */
-	CommandGline (InspIRCd* Instance) : Command(Instance,"GLINE",'o',1,false,0) { syntax = "<ident@host> [<duration> :<reason>]"; }
+	CommandGline (InspIRCd* Instance) : Command(Instance,"GLINE","o",1,false,0) { syntax = "<ident@host> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_kill.h b/include/commands/cmd_kill.h
index 29c93d0bf..16d80bb5e 100644
--- a/include/commands/cmd_kill.h
+++ b/include/commands/cmd_kill.h
@@ -29,7 +29,7 @@ class CommandKill : public Command
  public:
 	/** Constructor for kill.
 	 */
-	CommandKill (InspIRCd* Instance) : Command(Instance,"KILL",'o',2,false,0) { syntax = "<nickname> <reason>"; }
+	CommandKill (InspIRCd* Instance) : Command(Instance,"KILL","o",2,false,0) { syntax = "<nickname> <reason>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_kline.h b/include/commands/cmd_kline.h
index 3e987643f..fda1f39f4 100644
--- a/include/commands/cmd_kline.h
+++ b/include/commands/cmd_kline.h
@@ -29,7 +29,7 @@ class CommandKline : public Command
  public:
 	/** Constructor for kline.
 	 */
-	CommandKline (InspIRCd* Instance) : Command(Instance,"KLINE",'o',1,false,0) { syntax = "<ident@host> [<duration> :<reason>]"; }
+	CommandKline (InspIRCd* Instance) : Command(Instance,"KLINE","o",1,false,0) { syntax = "<ident@host> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_loadmodule.h b/include/commands/cmd_loadmodule.h
index 9d5ad621b..14b843449 100644
--- a/include/commands/cmd_loadmodule.h
+++ b/include/commands/cmd_loadmodule.h
@@ -29,7 +29,7 @@ class CommandLoadmodule : public Command
  public:
 	/** Constructor for loadmodule.
 	 */
-	CommandLoadmodule (InspIRCd* Instance) : Command(Instance,"LOADMODULE",'o',1) { syntax = "<modulename>"; }
+	CommandLoadmodule (InspIRCd* Instance) : Command(Instance,"LOADMODULE","o",1) { syntax = "<modulename>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_qline.h b/include/commands/cmd_qline.h
index 735c270b5..d3c0ae85e 100644
--- a/include/commands/cmd_qline.h
+++ b/include/commands/cmd_qline.h
@@ -29,7 +29,7 @@ class CommandQline : public Command
  public:
 	/** Constructor for qline.
 	 */
-	CommandQline (InspIRCd* Instance) : Command(Instance,"QLINE",'o',1,false,0) { syntax = "<nick> [<duration> :<reason>]"; }
+	CommandQline (InspIRCd* Instance) : Command(Instance,"QLINE","o",1,false,0) { syntax = "<nick> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_rehash.h b/include/commands/cmd_rehash.h
index 7eb843d9a..3d538ea32 100644
--- a/include/commands/cmd_rehash.h
+++ b/include/commands/cmd_rehash.h
@@ -29,7 +29,7 @@ class CommandRehash : public Command
  public:
 	/** Constructor for rehash.
 	 */
-	CommandRehash (InspIRCd* Instance) : Command(Instance,"REHASH",'o',0,false,3) { syntax = "[<servermask>]"; }
+	CommandRehash (InspIRCd* Instance) : Command(Instance,"REHASH","o",0,false,3) { syntax = "[<servermask>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_reloadmodule.h b/include/commands/cmd_reloadmodule.h
index 3ab68ea42..f35caf0f2 100644
--- a/include/commands/cmd_reloadmodule.h
+++ b/include/commands/cmd_reloadmodule.h
@@ -29,7 +29,7 @@ class CommandReloadmodule : public Command
  public:
 	/** Constructor for reloadmodule.
 	 */
-	CommandReloadmodule (InspIRCd* Instance) : Command(Instance,"RELOADMODULE",'o',1) { syntax = "<modulename>"; }
+	CommandReloadmodule (InspIRCd* Instance) : Command(Instance,"RELOADMODULE","o",1) { syntax = "<modulename>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_restart.h b/include/commands/cmd_restart.h
index 886c42b11..ddb14cbbc 100644
--- a/include/commands/cmd_restart.h
+++ b/include/commands/cmd_restart.h
@@ -32,7 +32,7 @@ class CommandRestart : public Command
  public:
 	/** Constructor for restart.
 	 */
-	CommandRestart (InspIRCd* Instance) : Command(Instance,"RESTART",'o',1,false,0) { syntax = "<password>"; }
+	CommandRestart (InspIRCd* Instance) : Command(Instance,"RESTART","o",1,false,0) { syntax = "<password>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_squit.h b/include/commands/cmd_squit.h
index a70b53ce7..9b1a19bf2 100644
--- a/include/commands/cmd_squit.h
+++ b/include/commands/cmd_squit.h
@@ -32,7 +32,7 @@ class CommandSquit : public Command
  public:
 	/** Constructor for squit.
 	 */
-	CommandSquit (InspIRCd* Instance) : Command(Instance,"SQUIT",'o',1) { syntax = "<servername> [<reason>]"; }
+	CommandSquit (InspIRCd* Instance) : Command(Instance,"SQUIT","o",1) { syntax = "<servername> [<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_trace.h b/include/commands/cmd_trace.h
index 24cabf0f8..3c476d1a7 100644
--- a/include/commands/cmd_trace.h
+++ b/include/commands/cmd_trace.h
@@ -29,7 +29,7 @@ class CommandTrace : public Command
  public:
 	/** Constructor for trace.
 	 */
-	CommandTrace (InspIRCd* Instance) : Command(Instance,"TRACE",'o',0) { syntax = "[<object>]"; }
+	CommandTrace (InspIRCd* Instance) : Command(Instance,"TRACE","o",0) { syntax = "[<object>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_unloadmodule.h b/include/commands/cmd_unloadmodule.h
index b102ec07f..bffbe3f24 100644
--- a/include/commands/cmd_unloadmodule.h
+++ b/include/commands/cmd_unloadmodule.h
@@ -29,7 +29,7 @@ class CommandUnloadmodule : public Command
  public:
 	/** Constructor for unloadmodule.
 	 */
-	CommandUnloadmodule (InspIRCd* Instance) : Command(Instance,"UNLOADMODULE",'o',1) { syntax = "<modulename>"; }
+	CommandUnloadmodule (InspIRCd* Instance) : Command(Instance,"UNLOADMODULE","o",1) { syntax = "<modulename>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_wallops.h b/include/commands/cmd_wallops.h
index f56a07f4c..84e8234c5 100644
--- a/include/commands/cmd_wallops.h
+++ b/include/commands/cmd_wallops.h
@@ -29,7 +29,7 @@ class CommandWallops : public Command
  public:
 	/** Constructor for wallops.
 	 */
-	CommandWallops (InspIRCd* Instance) : Command(Instance,"WALLOPS",'o',1) { syntax = "<any-text>"; }
+	CommandWallops (InspIRCd* Instance) : Command(Instance,"WALLOPS","o",1) { syntax = "<any-text>"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/commands/cmd_zline.h b/include/commands/cmd_zline.h
index cea166c26..b6a3a037a 100644
--- a/include/commands/cmd_zline.h
+++ b/include/commands/cmd_zline.h
@@ -29,7 +29,7 @@ class CommandZline : public Command
  public:
 	/** Constructor for zline.
 	 */
-	CommandZline (InspIRCd* Instance) : Command(Instance,"ZLINE",'o',1,false,0) { syntax = "<ipmask> [<duration> :<reason>]"; }
+	CommandZline (InspIRCd* Instance) : Command(Instance,"ZLINE","o",1,false,0) { syntax = "<ipmask> [<duration> :<reason>]"; }
 	/** Handle command.
 	 * @param parameters The parameters to the comamnd
 	 * @param pcnt The number of parameters passed to teh command
diff --git a/include/ctables.h b/include/ctables.h
index 8daddf192..1464494a3 100644
--- a/include/ctables.h
+++ b/include/ctables.h
@@ -89,14 +89,14 @@ class CoreExport Command : public Extensible
 	/** Create a new command.
 	 * @param Instance Pointer to creator class
 	 * @param cmd Command name. This must be UPPER CASE.
-	 * @param flags User modes required to execute the command.
+	 * @param flags User mode required to execute the command. May ONLY be one mode - it's a string to give warnings if people mix params up.
 	 * For oper only commands, set this to 'o', otherwise use 0.
 	 * @param minpara Minimum parameters required for the command.
 	 * @param before_reg If this is set to true, the command will
 	 * be allowed before the user is 'registered' (has sent USER,
 	 * NICK, optionally PASS, and been resolved).
 	 */
-	Command(InspIRCd* Instance, const std::string &cmd, char flags, int minpara, int before_reg = false, int penalty = 1) : ServerInstance(Instance), command(cmd), flags_needed(flags), min_params(minpara), disabled(false), works_before_reg(before_reg), Penalty(penalty)
+	Command(InspIRCd* Instance, const std::string &cmd, char *flags, int minpara, int before_reg = false, int penalty = 1) : ServerInstance(Instance), command(cmd), flags_needed(*flags), min_params(minpara), disabled(false), works_before_reg(before_reg), Penalty(penalty)
 	{
 		use_count = 0;
 		total_bytes = 0;