Oops

[user/henk/code/inspircd.git] / include / command_parse.h

diff --git a/include/command_parse.h b/include/command_parse.h
index a8a14497e88808d6a001dd229c52f9d865b9576e..78864a4ec4f79f0d6b8881745a5e26e3f6ed0bfa 100644 (file)
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -74,7 +74,7 @@ class CoreExport CommandParser : public classbase
  public:
        /** Command list, a hash_map of command names to Command*
         */
-       Commandable cmdlist;
+       Commandtable cmdlist;
 
        /** Reload a core command.
         * This will only reload commands implemented by the core,
@@ -93,8 +93,7 @@ class CoreExport CommandParser : public classbase
 
        /** Calls the handler for a given command.
         * @param commandname The command to find. This should be in uppercase.
-        * @param parameters Parameter list as an array of array of char (that's not a typo).
-        * @param pcnt The number of items in the parameters list
+        * @param parameters Parameter list
         * @param user The user to call the handler on behalf of
         * @return This method will return CMD_SUCCESS if the command handler was found and called,
         * and the command completeld successfully. It will return CMD_FAILURE if the command handler was found
@@ -193,11 +192,8 @@ class CoreExport CommandParser : public classbase
        bool CreateCommand(Command *f, void* so_handle = NULL);
 
        /** Insert the default RFC1459 commands into the command hash.
-        * Ignore any already loaded commands.
-        * @param user User to spool errors to, or if NULL, when an error occurs spool the errors to
-        * stdout then exit with EXIT_STATUS_HANDLER.
         */
-       void SetupCommandTable(User* user);
+       void SetupCommandTable();
 
        /** Translate nicknames in a string into UIDs, based on the TranslationType given.
         * @param to The translation type to use for the process.
@@ -235,9 +231,9 @@ const int duration_multi[] =
        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
        1, 1, 1, 1, 1, 1, 1, 1, 86400, 1, 1, 1, 3600,
        1, 1, 1, 1, 60, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-       604800, 1, 31536000, 1, 1, 1, 1, 1, 1, 1, 1,
+       604800, 1, 31557600, 1, 1, 1, 1, 1, 1, 1, 1,
        1, 1, 86400, 1, 1, 1, 3600, 1, 1, 1, 1, 60,
-       1, 1, 1, 1, 1, 1, 1, 1, 1, 604800, 1, 31536000,
+       1, 1, 1, 1, 1, 1, 1, 1, 1, 604800, 1, 31557600,
        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,