diff options
89 files changed, 210 insertions, 210 deletions
diff --git a/src/core/cs_status.c b/src/core/cs_status.c index d1c24b521..34427a523 100644 --- a/src/core/cs_status.c +++ b/src/core/cs_status.c @@ -24,7 +24,7 @@ class CommandCSStatus : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { ChannelInfo *ci; User *u2; diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c index a6d248801..c17a19f02 100644 --- a/src/core/cs_suspend.c +++ b/src/core/cs_suspend.c @@ -24,7 +24,7 @@ class CommandCSSuspend : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { ChannelInfo *ci; char *chan = params[0].c_str(); @@ -126,7 +126,7 @@ class CommandCSUnSuspend : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { ChannelInfo *ci; const char *chan = params[0].c_str(); diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c index 6a5af3dec..622fa8b52 100644 --- a/src/core/cs_topic.c +++ b/src/core/cs_topic.c @@ -24,7 +24,7 @@ class CommandCSTopic : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { char *chan = params[0].c_str(); char *topic = params.size() > 1 ? params[1].c_str() : NULL; diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c index eea75018b..e1168f142 100644 --- a/src/core/cs_xop.c +++ b/src/core/cs_xop.c @@ -102,7 +102,7 @@ int xop_msgs[XOP_TYPES][XOP_MESSAGES] = { class XOPBase : public Command { private: - CommandResult DoAdd(User *u, std::vector<std::string> ¶ms, ChannelInfo *ci, int level, int *messages) + CommandReturn DoAdd(User *u, std::vector<std::string> ¶ms, ChannelInfo *ci, int level, int *messages) { const char *nick = params.size() > 2 ? params[2].c_str() : NULL; ChanAccess *access; @@ -198,7 +198,7 @@ class XOPBase : public Command return MOD_CONT; } - CommandResult DoDel(User *u, std::vector<std::string> ¶ms, ChannelInfo *ci, int level, int *messages) + CommandReturn DoDel(User *u, std::vector<std::string> ¶ms, ChannelInfo *ci, int level, int *messages) { const char *nick = params.size() > 2 ? params[2].c_str() : NULL; ChanAccess *access; @@ -329,7 +329,7 @@ class XOPBase : public Command return MOD_CONT; } - CommandResult DoList(User *u, std::vector<std::string> ¶ms, ChannelInfo *ci, int level, int *messages) + CommandReturn DoList(User *u, std::vector<std::string> ¶ms, ChannelInfo *ci, int level, int *messages) { int sent_header = 0; const char *nick = params.size() > 2 ? params[2].c_str() : NULL; @@ -365,7 +365,7 @@ class XOPBase : public Command return MOD_CONT; } - CommandResult DoClear(User *u, std::vector<std::string> ¶ms, ChannelInfo *ci, int level, int *messages) + CommandReturn DoClear(User *u, std::vector<std::string> ¶ms, ChannelInfo *ci, int level, int *messages) { if (readonly) { @@ -400,7 +400,7 @@ class XOPBase : public Command return MOD_CONT; } - CommandResult DoXop(User *u, std::vector<std::string> ¶ms, int level, int *messages) + CommandReturn DoXop(User *u, std::vector<std::string> ¶ms, int level, int *messages) { const char *chan = params[0].c_str(); const char *cmd = params[1].c_str(); @@ -434,7 +434,7 @@ class XOPBase : public Command { } - virtual CommandResult Execute(User *u, std::vector<std::string> ¶ms) = 0; + virtual CommandReturn Execute(User *u, std::vector<std::string> ¶ms) = 0; virtual bool OnHelp(User *u, const std::string &subcommand) = 0; @@ -448,7 +448,7 @@ class CommandCSAOP : public XOPBase { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { return this->DoXop(u, params, ACCESS_AOP, xop_msgs[XOP_AOP]); } @@ -472,7 +472,7 @@ class CommandCSHOP : public XOPBase { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { return this->DoXop(u, params, ACCESS_HOP, xop_msgs[XOP_HOP]); } @@ -496,7 +496,7 @@ class CommandCSSOP : public XOPBase { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { return this->DoXop(u, params, ACCESS_SOP, xop_msgs[XOP_SOP]); } @@ -520,7 +520,7 @@ class CommandCSVOP : public XOPBase { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { return this->DoXop(u, params, ACCESS_VOP, xop_msgs[XOP_VOP]); } diff --git a/src/core/he_help.c b/src/core/he_help.c index 5b3f4a129..c4411e711 100644 --- a/src/core/he_help.c +++ b/src/core/he_help.c @@ -22,7 +22,7 @@ class CommandHEHelp : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { mod_help_cmd(s_HelpServ, u, HELPSERV, params[0].c_str()); return MOD_CONT; diff --git a/src/core/hs_del.c b/src/core/hs_del.c index 3318d0ba6..15f218088 100644 --- a/src/core/hs_del.c +++ b/src/core/hs_del.c @@ -24,7 +24,7 @@ class CommandHSDel : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { NickAlias *na; const char *nick = params[0].c_str(); diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c index a373ef487..5976100d2 100644 --- a/src/core/hs_delall.c +++ b/src/core/hs_delall.c @@ -24,7 +24,7 @@ class CommandHSDelAll : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { int i; const char *nick = params[0].c_str(); diff --git a/src/core/hs_group.c b/src/core/hs_group.c index 2a7dd5a57..0d3eb729a 100644 --- a/src/core/hs_group.c +++ b/src/core/hs_group.c @@ -25,7 +25,7 @@ class CommandHSGroup : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { NickAlias *na; HostCore *tmp; diff --git a/src/core/hs_help.c b/src/core/hs_help.c index 5cc70213c..e1278400a 100644 --- a/src/core/hs_help.c +++ b/src/core/hs_help.c @@ -22,7 +22,7 @@ class CommandHSHelp : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { mod_help_cmd(s_HostServ, u, HOSTSERV, params[0].c_str()); return MOD_CONT; diff --git a/src/core/hs_list.c b/src/core/hs_list.c index ea7e08967..615d3b0c7 100644 --- a/src/core/hs_list.c +++ b/src/core/hs_list.c @@ -24,7 +24,7 @@ class CommandHSList : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *key = params.size() ? params[0].c_str() : NULL; struct tm *tm; diff --git a/src/core/hs_off.c b/src/core/hs_off.c index 84639a941..6ba1d77a8 100644 --- a/src/core/hs_off.c +++ b/src/core/hs_off.c @@ -24,7 +24,7 @@ class CommandHSOff : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { NickAlias *na; char *vhost; diff --git a/src/core/hs_on.c b/src/core/hs_on.c index 1cad7a93c..3050dee32 100644 --- a/src/core/hs_on.c +++ b/src/core/hs_on.c @@ -24,7 +24,7 @@ class CommandHSOn : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { NickAlias *na; char *vHost; diff --git a/src/core/hs_set.c b/src/core/hs_set.c index 0a63923ba..10a717ae5 100644 --- a/src/core/hs_set.c +++ b/src/core/hs_set.c @@ -24,7 +24,7 @@ class CommandHSSet : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params[0].c_str(); const char *rawhostmask = params[1].c_str(); diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c index 09f63c12f..df069101e 100644 --- a/src/core/hs_setall.c +++ b/src/core/hs_setall.c @@ -25,7 +25,7 @@ class CommandHSSetAll : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params[0].c_str(); const char *rawhostmask = params[1].c_str(); diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c index 63c81ea22..7e569539c 100644 --- a/src/core/ms_cancel.c +++ b/src/core/ms_cancel.c @@ -24,7 +24,7 @@ class CommandMSCancel : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { int ischan; int isforbid; diff --git a/src/core/ms_check.c b/src/core/ms_check.c index 477ec1517..9bee02764 100644 --- a/src/core/ms_check.c +++ b/src/core/ms_check.c @@ -24,7 +24,7 @@ class CommandMSCheck : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { NickAlias *na = NULL; MemoInfo *mi = NULL; diff --git a/src/core/ms_del.c b/src/core/ms_del.c index 61188e18b..effb84c4c 100644 --- a/src/core/ms_del.c +++ b/src/core/ms_del.c @@ -25,7 +25,7 @@ class CommandMSDel : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { MemoInfo *mi; ChannelInfo *ci; diff --git a/src/core/ms_help.c b/src/core/ms_help.c index 4fa4ac783..d76c7515e 100644 --- a/src/core/ms_help.c +++ b/src/core/ms_help.c @@ -22,7 +22,7 @@ class CommandMSHelp : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { mod_help_cmd(s_MemoServ, u, MEMOSERV, params[0].c_str()); return MOD_CONT; diff --git a/src/core/ms_info.c b/src/core/ms_info.c index 96dd9f751..2b015aca1 100644 --- a/src/core/ms_info.c +++ b/src/core/ms_info.c @@ -24,7 +24,7 @@ class CommandMSInfo : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { MemoInfo *mi; NickAlias *na = NULL; diff --git a/src/core/ms_list.c b/src/core/ms_list.c index d8153593a..fab0699fa 100644 --- a/src/core/ms_list.c +++ b/src/core/ms_list.c @@ -26,7 +26,7 @@ class CommandMSList : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *param = params.size() ? params[0].c_str() : NULL, *chan = NULL; ChannelInfo *ci; diff --git a/src/core/ms_read.c b/src/core/ms_read.c index b3046fa3f..f33778147 100644 --- a/src/core/ms_read.c +++ b/src/core/ms_read.c @@ -27,7 +27,7 @@ class CommandMSRead : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { MemoInfo *mi; ChannelInfo *ci; diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c index 120a9e0de..d8ae5782c 100644 --- a/src/core/ms_rsend.c +++ b/src/core/ms_rsend.c @@ -24,7 +24,7 @@ class CommandMSRSend : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *name = params[0].c_str(); const char *text = params[1].c_str(); diff --git a/src/core/ms_send.c b/src/core/ms_send.c index ea91883ba..eb0395def 100644 --- a/src/core/ms_send.c +++ b/src/core/ms_send.c @@ -24,7 +24,7 @@ class CommandMSSend : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *name = params[0].c_str(); const char *text = params[1].c_str(); diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c index cee26e418..f52b8430d 100644 --- a/src/core/ms_sendall.c +++ b/src/core/ms_sendall.c @@ -24,7 +24,7 @@ class CommandMSSendAll : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { int i, z = 1; NickCore *nc; diff --git a/src/core/ms_set.c b/src/core/ms_set.c index c086da58d..7af25c01f 100644 --- a/src/core/ms_set.c +++ b/src/core/ms_set.c @@ -20,7 +20,7 @@ void myMemoServHelp(User *u); class CommandMSSet : public Command { private: - CommandResult DoNotify(User *u, std::vector<std::string> ¶ms, MemoInfo &mi) + CommandReturn DoNotify(User *u, std::vector<std::string> ¶ms, MemoInfo &mi) { const char *params = params[1].c_str(); @@ -66,7 +66,7 @@ class CommandMSSet : public Command return MOD_CONT; } - CommandResult DoLimit(User *u, std::vector<std::string> ¶ms) + CommandReturn DoLimit(User *u, std::vector<std::string> ¶ms) { const char *p1 = params[1].c_str(); const char *p2 = params.size() > 2 ? params[2].c_str() : NULL; @@ -209,7 +209,7 @@ class CommandMSSet : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); MemoInfo *mi = &u->na->nc->memos; diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c index 2f6bf2d1f..83642ead8 100644 --- a/src/core/ms_staff.c +++ b/src/core/ms_staff.c @@ -24,7 +24,7 @@ class CommandMSStaff : public Command { } - CommandResult Execute(User *u, std::vecyor<std::string> ¶ms) + CommandReturn Execute(User *u, std::vecyor<std::string> ¶ms) { NickCore *nc; int i, z = 0; diff --git a/src/core/ns_access.c b/src/core/ns_access.c index 6ccf31d94..a6532b7f4 100644 --- a/src/core/ns_access.c +++ b/src/core/ns_access.c @@ -20,7 +20,7 @@ void myNickServHelp(User *u); class CommandNSAccess : public Command { private: - CommandResult DoServAdminList(User *u, std::vector<std::string> ¶ms) + CommandReturn DoServAdminList(User *u, std::vector<std::string> ¶ms) { const char *mask = params.size() > 2 ? params[2].c_str() : NULL; char **access; @@ -55,7 +55,7 @@ class CommandNSAccess : public Command return MOD_CONT; } - CommandResult DoAdd(User *u, std::vector<std::string> ¶ms, const char *mask) + CommandReturn DoAdd(User *u, std::vector<std::string> ¶ms, const char *mask) { char **access; int i; @@ -89,7 +89,7 @@ class CommandNSAccess : public Command return MOD_CONT; } - CommandResult DoDel(User *u, std::vector<std::string> ¶ms, const char *mask) + CommandReturn DoDel(User *u, std::vector<std::string> ¶ms, const char *mask) { char **access; int i; @@ -127,7 +127,7 @@ class CommandNSAccess : public Command return MOD_CONT; } - CommandResult DoList(User *u, std::vector<std::string> *params, const char *mask) + CommandReturn DoList(User *u, std::vector<std::string> *params, const char *mask) { char **access; int i; @@ -153,7 +153,7 @@ class CommandNSAccess : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); const char *mask = params.size() > 1 ? params[1].c_str() : NULL; diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c index 985948442..1c1ffd2b6 100644 --- a/src/core/ns_alist.c +++ b/src/core/ns_alist.c @@ -24,7 +24,7 @@ class CommandNSAList : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { /* * List the channels that the given nickname has access on diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c index 62b09ec4d..6b1113adc 100644 --- a/src/core/ns_drop.c +++ b/src/core/ns_drop.c @@ -24,7 +24,7 @@ class CommandNSDrop : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params.size() ? params[0].c_str() : NULL; NickAlias *na; diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c index 53268916f..88ec3d547 100644 --- a/src/core/ns_forbid.c +++ b/src/core/ns_forbid.c @@ -25,7 +25,7 @@ class CommandNSForbid : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { NickAlias *na; const char *nick = params[0].c_str(); diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c index ee2e9e16f..2e64b181a 100644 --- a/src/core/ns_getemail.c +++ b/src/core/ns_getemail.c @@ -29,7 +29,7 @@ class CommandNSGetEMail : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *email = params[0].c_str(); int i, j = 0; diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c index cb6a49748..a348711f8 100644 --- a/src/core/ns_getpass.c +++ b/src/core/ns_getpass.c @@ -24,7 +24,7 @@ class CommandNSGetPass : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params[0].c_str(); char tmp_pass[PASSMAX]; diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c index 85769dc3a..a751f8af8 100644 --- a/src/core/ns_ghost.c +++ b/src/core/ns_ghost.c @@ -24,7 +24,7 @@ class CommandNSGhost : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params[0].c_str(); const char *pass = params.size() > 1 ? params[1].c_str() : NULL; diff --git a/src/core/ns_group.c b/src/core/ns_group.c index 816a163fa..9fb7db9d6 100644 --- a/src/core/ns_group.c +++ b/src/core/ns_group.c @@ -26,7 +26,7 @@ class CommandNSGroup : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { NickAlias *na, *target; NickCore *nc; @@ -218,7 +218,7 @@ class CommandNSGList : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params.size() ? params[0].c_str() : NULL; diff --git a/src/core/ns_help.c b/src/core/ns_help.c index 4d9129236..68351dba7 100644 --- a/src/core/ns_help.c +++ b/src/core/ns_help.c @@ -22,7 +22,7 @@ class CommandNSHelp : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str() if (!stricmp(cmd, "SET LANGUAGE")) diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c index f44b2c715..8a104b5ab 100644 --- a/src/core/ns_identify.c +++ b/src/core/ns_identify.c @@ -27,7 +27,7 @@ class CommandNSIdentify : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { char *pass = params[0].c_str(); NickAlias *na; diff --git a/src/core/ns_info.c b/src/core/ns_info.c index dc91a881b..a1b7e82aa 100644 --- a/src/core/ns_info.c +++ b/src/core/ns_info.c @@ -37,7 +37,7 @@ class CommandNSInfo : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { /* Show hidden info to nick owners and sadmins when the "ALL" parameter is * supplied. If a nick is online, the "Last seen address" changes to "Is diff --git a/src/core/ns_list.c b/src/core/ns_list.c index 389fdaba9..33650db97 100644 --- a/src/core/ns_list.c +++ b/src/core/ns_list.c @@ -24,7 +24,7 @@ class CommandNSList : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { /* SADMINS can search for nicks based on their NS_FORBIDDEN and NS_NO_EXPIRE * status. The keywords FORBIDDEN and NOEXPIRE represent these two states diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c index 8ad8e7205..74101d021 100644 --- a/src/core/ns_logout.c +++ b/src/core/ns_logout.c @@ -27,7 +27,7 @@ class CommandNSLogout : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { char *nick = params.size() ? params[0].c_str() : NULL; char *param = params.size() > 1 ? params[1].c_str() : NULL; diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c index 515754eb3..921bdd5c7 100644 --- a/src/core/ns_recover.c +++ b/src/core/ns_recover.c @@ -24,7 +24,7 @@ class CommandNSRecover : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { char *nick = params[0].c_str(); char *pass = params.size() > 1 ? params[1].c_str() : NULL; diff --git a/src/core/ns_register.c b/src/core/ns_register.c index ac601ec71..549d358fa 100644 --- a/src/core/ns_register.c +++ b/src/core/ns_register.c @@ -24,7 +24,7 @@ int do_sendregmail(User *u, NickRequest *nr); class CommandNSConfirm : public Command { private: - CommandResult DoConfirm(User *u, std::vector<std::string> ¶ms) + CommandReturn DoConfirm(User *u, std::vector<std::string> ¶ms) { NickRequest *nr = NULL; NickAlias *na = NULL; @@ -212,7 +212,7 @@ class CommandNSConfirm : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { return this->DoConfirm(u, params); } @@ -231,7 +231,7 @@ class CommandNSRegister : public CommandNSConfirm { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { NickRequest *nr = NULL, *anr = NULL; NickCore *nc = NULL; @@ -400,7 +400,7 @@ class CommandNSResend : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { NickRequest *nr = NULL; if (NSEmailReg) diff --git a/src/core/ns_release.c b/src/core/ns_release.c index 37a0b0d16..22e15eb82 100644 --- a/src/core/ns_release.c +++ b/src/core/ns_release.c @@ -24,7 +24,7 @@ class CommandNSRelease : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params[0].c_str(); const char *pass = params.size() > 1 ? params[1].c_str() : NULL; diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c index 7309fe733..af53f2e6c 100644 --- a/src/core/ns_saset.c +++ b/src/core/ns_saset.c @@ -21,7 +21,7 @@ void myNickServHelp(User *u); class CommandNSSASet : public Command { private: - CommandResult DoSetDisplay(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetDisplay(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; int i; @@ -60,7 +60,7 @@ class CommandNSSASet : public Command return MOD_CONT; } - CommandResult DoSetPassword(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetPassword(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; @@ -109,7 +109,7 @@ class CommandNSSASet : public Command return MOD_CONT; } - CommandResult DoSetUrl(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetUrl(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; @@ -129,7 +129,7 @@ class CommandNSSASet : public Command return MOD_CONT; } - CommandResult DoSetEmail(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetEmail(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; @@ -167,7 +167,7 @@ class CommandNSSASet : public Command return MOD_CONT; } - CommandResult DoSetICQ(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetICQ(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; @@ -191,7 +191,7 @@ class CommandNSSASet : public Command return MOD_CONT; } - CommandResult DoSetGreet(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetGreet(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; @@ -216,7 +216,7 @@ class CommandNSSASet : public Command return MOD_CONT; } - CommandResult DoSetKill(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetKill(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; @@ -259,7 +259,7 @@ class CommandNSSASet : public Command return MOD_CONT; } - CommandResult DoSetSecure(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetSecure(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; @@ -284,7 +284,7 @@ class CommandNSSASet : public Command return MOD_CONT; } - CommandResult DoSetPrivate(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetPrivate(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; @@ -309,7 +309,7 @@ class CommandNSSASet : public Command return MOD_CONT; } - CommandResult DoSetMsg(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetMsg(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; @@ -340,7 +340,7 @@ class CommandNSSASet : public Command return MOD_CONT; } - CommandResult DoSetHide(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetHide(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; @@ -400,7 +400,7 @@ class CommandNSSASet : public Command return MOD_CONT; } - CommandResult DoSetNoExpire(User *u, std::vector<std::string> ¶ms, NickAlias *na) + CommandReturn DoSetNoExpire(User *u, std::vector<std::string> ¶ms, NickAlias *na) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; @@ -425,7 +425,7 @@ class CommandNSSASet : public Command return MOD_CONT; } - CommandResult DoSetAutoOP(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetAutoOP(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; @@ -451,7 +451,7 @@ class CommandNSSASet : public Command return MOD_CONT; } - CommandResult DoSetLanguage(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetLanguage(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 2 ? params[2].c_str() : NULL; @@ -484,7 +484,7 @@ class CommandNSSASet : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params[0].c_str(); const char *cmd = params[1].c_str(); diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c index 70009a149..ed4a7a4cd 100644 --- a/src/core/ns_sendpass.c +++ b/src/core/ns_sendpass.c @@ -24,7 +24,7 @@ class CommandNSSendPass : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params[0].c_str(); NickAlias *na; diff --git a/src/core/ns_set.c b/src/core/ns_set.c index 47c66efa8..c19352bb7 100644 --- a/src/core/ns_set.c +++ b/src/core/ns_set.c @@ -21,7 +21,7 @@ void myNickServHelp(User *u); class CommandNSSet : public Command { private: - CommandResult DoSetDisplay(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetDisplay(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 1 ? params[1].c_str() : NULL; @@ -61,7 +61,7 @@ class CommandNSSet : public Command return MOD_CONT; } - CommandResult DoSetPassword(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetPassword(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 1 ? params[1].c_str() : NULL; @@ -104,7 +104,7 @@ class CommandNSSet : public Command return MOD_CONT; } - CommandResult DoSetLanguage(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetLanguage(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 1 ? params[1].c_str() : NULL; @@ -132,7 +132,7 @@ class CommandNSSet : public Command return MOD_CONT; } - CommandResult DoSetUrl(User *u, std::vector<std::string> ¶ms) + CommandReturn DoSetUrl(User *u, std::vector<std::string> ¶ms) { const char *param = params.size() > 1 ? params[1].c_str() : NULL; @@ -152,7 +152,7 @@ class CommandNSSet : public Command return MOD_CONT; } - CommandResult DoSetEmail(User *u, std::vector<std::string> ¶ms) + CommandReturn DoSetEmail(User *u, std::vector<std::string> ¶ms) { const char *param = params.size() > 1 ? params[1].c_str() : NULL; @@ -185,7 +185,7 @@ class CommandNSSet : public Command return MOD_CONT; } - CommandResult DoSetICQ(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetICQ(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 1 ? params[1].c_str() : NULL; @@ -208,7 +208,7 @@ class CommandNSSet : public Command return MOD_CONT; } - CommandResult DoSetGreet(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetGreet(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 1 ? params[1].c_str() : NULL; @@ -233,7 +233,7 @@ class CommandNSSet : public Command return MOD_CONT; } - CommandResult DoSetKill(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetKill(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 1 ? params[1].c_str() : NULL; @@ -276,7 +276,7 @@ class CommandNSSet : public Command return MOD_CONT; } - CommandResult DoSetSecure(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetSecure(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 1 ? params[1].c_str() : NULL; @@ -301,7 +301,7 @@ class CommandNSSet : public Command return MOD_CONT; } - CommandResult DoSetPrivate(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetPrivate(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 1 ? params[1].c_str() : NULL; @@ -326,7 +326,7 @@ class CommandNSSet : public Command return MOD_CONT; } - CommandResult DoSetMsg(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetMsg(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 1 ? params[1].c_str() : NULL; @@ -357,7 +357,7 @@ class CommandNSSet : public Command return MOD_CONT; } - CommandResult DoSetHide(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetHide(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 1 ? params[1].c_str() : NULL; @@ -417,7 +417,7 @@ class CommandNSSet : public Command return MOD_CONT; } - CommandResult DoSetAutoOP(User *u, std::vector<std::string> ¶ms, NickCore *nc) + CommandReturn DoSetAutoOP(User *u, std::vector<std::string> ¶ms, NickCore *nc) { const char *param = params.size() > 1 ? params[1].c_str() : NULL; @@ -452,7 +452,7 @@ class CommandNSSet : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); NickAlias *na = u->na; diff --git a/src/core/ns_status.c b/src/core/ns_status.c index c2ece7657..1db7c7ce5 100644 --- a/src/core/ns_status.c +++ b/src/core/ns_status.c @@ -24,7 +24,7 @@ class CommandNSStatus : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { User *u2; NickAlias *na = NULL; diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c index 62146497c..947921ac7 100644 --- a/src/core/ns_suspend.c +++ b/src/core/ns_suspend.c @@ -24,7 +24,7 @@ class CommandNSSuspend : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { NickAlias *na, *na2; const char *nick = params[0].c_str(); @@ -108,7 +108,7 @@ class CommandNSUnSuspend : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { NickAlias *na; const char *nick = params[0].c_str(); diff --git a/src/core/os_admin.c b/src/core/os_admin.c index 955751629..fcf3e05f7 100644 --- a/src/core/os_admin.c +++ b/src/core/os_admin.c @@ -22,7 +22,7 @@ void myOperServHelp(User *u); class CommandOSAdmin : public Command { private: - CommandResult DoAdd(User *u, std::vector<std::string> ¶ms) + CommandReturn DoAdd(User *u, std::vector<std::string> ¶ms) { const char *nick = params.size() > 1 ? params[1].c_str() : NULL; int res = 0; @@ -84,7 +84,7 @@ class CommandOSAdmin : public Command return MOD_CONT; } - CommandResult DoDel(User *u, std::vector<std::string> ¶ms) + CommandReturn DoDel(User *u, std::vector<std::string> ¶ms) { const char *nick = params.size() > 1 ? params[1].c_str() : NULL; int res = 0; @@ -151,7 +151,7 @@ class CommandOSAdmin : public Command return MOD_CONT; } - CommandResult DoList(User *u, std::vector<std::string> ¶ms) + CommandReturn DoList(User *u, std::vector<std::string> ¶ms) { const char *nick = params.size() > 1 ? params[1].c_str() : NULL; int sent_header = 0, res = 0; @@ -191,7 +191,7 @@ class CommandOSAdmin : public Command return MOD_CONT; } - CommandResult DoClear(User *u, std::vector<std::string> ¶ms) + CommandReturn DoClear(User *u, std::vector<std::string> ¶ms) { if (!is_services_root(u)) { @@ -216,7 +216,7 @@ class CommandOSAdmin : public Command this->help_param1 = s_NickServ; } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); diff --git a/src/core/os_akill.c b/src/core/os_akill.c index 9bd6c6cfd..93178d4bc 100644 --- a/src/core/os_akill.c +++ b/src/core/os_akill.c @@ -24,7 +24,7 @@ int akill_list(int number, Akill *ak, User *u, int *sent_header); class CommandOSAKill : public Command { private: - CommandResult DoAdd(User *u, std::vector<std::string> ¶ms) + CommandReturn DoAdd(User *u, std::vector<std::string> ¶ms) { int deleted = 0, last_param = 2; const char *expiry, *mask; @@ -139,7 +139,7 @@ class CommandOSAKill : public Command return MOD_CONT; } - CommandResult DoDel(User *u, std::vector<std::string> ¶ms) + CommandReturn DoDel(User *u, std::vector<std::string> ¶ms) { const char *mask; int res = 0; @@ -190,7 +190,7 @@ class CommandOSAKill : public Command return MOD_CONT; } - CommandResult DoList(User *u, std::vector<std::string> ¶ms) + CommandReturn DoList(User *u, std::vector<std::string> ¶ms) { const char *mask; int res, sent_header = 0; @@ -235,7 +235,7 @@ class CommandOSAKill : public Command return MOD_CONT; } - CommandResult DoView(User *u, std::vector<std::string> ¶ms) + CommandReturn DoView(User *u, std::vector<std::string> ¶ms) { const char *mask; int res, sent_header = 0; @@ -276,7 +276,7 @@ class CommandOSAKill : public Command return MOD_CONT; } - CommandResult DoClear(User *u, std::vector<std::string> ¶ms) + CommandReturn DoClear(User *u, std::vector<std::string> ¶ms) { slist_clear(&akills, 1); notice_lang(s_OperServ, u, OPER_AKILL_CLEAR); @@ -288,7 +288,7 @@ class CommandOSAKill : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); char breason[BUFSIZE]; diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c index c3318238a..ce2f3b7b0 100644 --- a/src/core/os_chankill.c +++ b/src/core/os_chankill.c @@ -24,7 +24,7 @@ class CommandOSChanKill : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *expiry, *channel; char reason[BUFSIZE]; diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c index 79edff808..b3fb30489 100644 --- a/src/core/os_chanlist.c +++ b/src/core/os_chanlist.c @@ -24,7 +24,7 @@ class CommandOSChanList : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { char *pattern = params.size() > 0 ? params[0].c_str() : NULL; char *opt = params.size() > 1 ? params[1].c_str() : NULL; diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c index 314f0ed8b..429570b67 100644 --- a/src/core/os_clearmodes.c +++ b/src/core/os_clearmodes.c @@ -24,7 +24,7 @@ class CommandOSClearModes : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *s; const char *argv[2]; diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c index 1a3a14317..edfec8580 100644 --- a/src/core/os_defcon.c +++ b/src/core/os_defcon.c @@ -26,7 +26,7 @@ class CommandOSDEFCON : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { char *lvl = params[0].c_str(); int newLevel = 0; diff --git a/src/core/os_global.c b/src/core/os_global.c index c05635270..0c79e8713 100644 --- a/src/core/os_global.c +++ b/src/core/os_global.c @@ -25,7 +25,7 @@ class CommandOSGlobal : public Command this->help_param1 = s_GlobalNoticer; } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *msg = params[1].c_str(); diff --git a/src/core/os_help.c b/src/core/os_help.c index b2624de37..d7ddb666e 100644 --- a/src/core/os_help.c +++ b/src/core/os_help.c @@ -22,7 +22,7 @@ class CommandOSHelp : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { mod_help_cmd(s_OperServ, u, OPERSERV, params[0].c_str()); return MOD_CONT; diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c index 6c8773dc6..b76de379b 100644 --- a/src/core/os_ignore.c +++ b/src/core/os_ignore.c @@ -20,7 +20,7 @@ void myOperServHelp(User *u); class CommandOSIgnore : public Command { private: - CommandResult DoAdd(User *u, std::vector<std::string> ¶ms) + CommandReturn DoAdd(User *u, std::vector<std::string> ¶ms) { char *time = params.size() > 1 ? params[1].c_str() : NULL; char *nick = params.size() > 2 ? params[2].c_str() : NULL; @@ -55,7 +55,7 @@ class CommandOSIgnore : public Command return MOD_CONT; } - CommandResult DoList(User *u, std::vector<std::string> ¶ms) + CommandReturn DoList(User *u, std::vector<std::string> ¶ms) { IgnoreData *id; @@ -72,7 +72,7 @@ class CommandOSIgnore : public Command return MOD_CONT; } - CommandResult DoDel(User *u, std::vector<std::string> ¶ms) + CommandReturn DoDel(User *u, std::vector<std::string> ¶ms) { char *nick = params.size() > 1 ? params[1].c_str() : NULL; if (!nick) @@ -90,7 +90,7 @@ class CommandOSIgnore : public Command return MOD_CONT; } - CommandResult DoClear(User *u, std::vector<std::string> ¶ms) + CommandReturn DoClear(User *u, std::vector<std::string> ¶ms) { clear_ignores(); notice_lang(s_OperServ, u, OPER_IGNORE_LIST_CLEARED); @@ -102,7 +102,7 @@ class CommandOSIgnore : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); int t; diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c index 5c70b4b4b..e288887a4 100644 --- a/src/core/os_jupe.c +++ b/src/core/os_jupe.c @@ -24,7 +24,7 @@ class CommandOSJupe : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *jserver = params[0].c_str(); const char *reason = params.size() > 1 ? params[1].c_str() : NULL; diff --git a/src/core/os_kick.c b/src/core/os_kick.c index 6315835a9..c332f98c4 100644 --- a/src/core/os_kick.c +++ b/src/core/os_kick.c @@ -24,7 +24,7 @@ class CommandOSKick : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *argv[3]; const char *chan = params[0].c_str(), *nick = params[1].c_str(), *s = params[2].c_str(); diff --git a/src/core/os_mode.c b/src/core/os_mode.c index 63920702f..d0c8b518a 100644 --- a/src/core/os_mode.c +++ b/src/core/os_mode.c @@ -24,7 +24,7 @@ class CommandOSMode : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { int ac; const char **av; diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c index fed7a0b8f..0ff907f59 100644 --- a/src/core/os_modinfo.c +++ b/src/core/os_modinfo.c @@ -25,7 +25,7 @@ class CommandOSModInfo : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *file = params[0].c_str(); struct tm tm; diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c index 21a2a1f30..62b16006b 100644 --- a/src/core/os_modlist.c +++ b/src/core/os_modlist.c @@ -24,7 +24,7 @@ class CommandOSModList : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { int idx; int count = 0; diff --git a/src/core/os_modload.c b/src/core/os_modload.c index c1cb1be86..050a3f8ba 100644 --- a/src/core/os_modload.c +++ b/src/core/os_modload.c @@ -24,7 +24,7 @@ class CommandOSModLoad : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { char *name; diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c index e9bef9f04..58473d969 100644 --- a/src/core/os_modunload.c +++ b/src/core/os_modunload.c @@ -24,7 +24,7 @@ class CommandOSModUnLoad : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *name = params[0].c_str(); int status; diff --git a/src/core/os_news.c b/src/core/os_news.c index bbf1018c1..ef1d30b02 100644 --- a/src/core/os_news.c +++ b/src/core/os_news.c @@ -21,7 +21,7 @@ int reload_config(int argc, char **argv); class NewsBase : public Command { private: - CommandResult DoList(User *u, std::vector<std::string> ¶ms, short type, int *msgs) + CommandReturn DoList(User *u, std::vector<std::string> ¶ms, short type, int *msgs) { int i, count = 0; char timebuf[64]; @@ -47,7 +47,7 @@ class NewsBase : public Command return MOD_CONT; } - CommandResult DoAdd(User *u, std::vector<std::string> ¶ms, short type, int *msgs) + CommandReturn DoAdd(User *u, std::vector<std::string> ¶ms, short type, int *msgs) { const char *text = params.size() > 1 ? params[1].c_str() : NULL; int n; @@ -71,7 +71,7 @@ class NewsBase : public Command return MOD_CONT; } - CommandResult DoDel(User *u, std::vector<std::string> ¶ms, short type, int *msgs) + CommandReturn DoDel(User *u, std::vector<std::string> ¶ms, short type, int *msgs) { const char *text = params.size() > 1 ? params[1].c_str() : NULL; int i, num; @@ -113,7 +113,7 @@ class NewsBase : public Command return MOD_CONT; } - CommandResult DoNews(User *u, std::vector<std::string> ¶ms, short type) + CommandReturn DoNews(User *u, std::vector<std::string> ¶ms, short type) { int is_servadmin = is_services_admin(u); const char *cmd = params[0].c_str(); @@ -155,7 +155,7 @@ class NewsBase : public Command { } - virtual CommandResult Execute(User *u, std::vector<std::string> ¶ms) = 0; + virtual CommandReturn Execute(User *u, std::vector<std::string> ¶ms) = 0; virtual bool OnHelp(User *u, const std::string &subcommand) = 0; @@ -177,7 +177,7 @@ class CommandOSLogonNews : public NewsBase delete [] this->help_param1; } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { return this->DoNews(u, params, NEWS_LOGON); } @@ -223,7 +223,7 @@ class CommandOSOperNews : public NewsBase delete [] this->help_param1; } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { return this->DoNews(u, params, NEWS_OPER); } @@ -261,7 +261,7 @@ class CommandOSRandomNews : public NewsBase { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { return this->DoNews(u, params, NEWS_RANDOM); } diff --git a/src/core/os_noop.c b/src/core/os_noop.c index 98186c7dc..6fe172529 100644 --- a/src/core/os_noop.c +++ b/src/core/os_noop.c @@ -24,7 +24,7 @@ class CommandOSNOOP : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); const char *server = params[1].c_str(); diff --git a/src/core/os_oline.c b/src/core/os_oline.c index 66f811b2c..c001edbe4 100644 --- a/src/core/os_oline.c +++ b/src/core/os_oline.c @@ -24,7 +24,7 @@ class CommandOSOLine : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params[0].c_str(); const char *flags = params[1].c_str(); diff --git a/src/core/os_oper.c b/src/core/os_oper.c index 92b6b21cb..cd6c23184 100644 --- a/src/core/os_oper.c +++ b/src/core/os_oper.c @@ -22,7 +22,7 @@ void myOperServHelp(User *u); class CommandOSOper : public Command { private: - CommandResult DoAdd(User *u, std::vector<std::string> ¶ms) + CommandReturn DoAdd(User *u, std::vector<std::string> ¶ms) { const char *nick = param.size() > 1 ? params[1].c_str() : NULL; NickAlias *na; @@ -90,7 +90,7 @@ class CommandOSOper : public Command return MOD_CONT; } - CommandResult DoDel(User *u, std::vector<std::string> ¶ms) + CommandReturn DoDel(User *u, std::vector<std::string> ¶ms) { const char *nick = params.size() > 1 ? params[1].c_str() : NULL; NickAlias *na; @@ -152,7 +152,7 @@ class CommandOSOper : public Command return MOD_CONT; } - CommandResult DoList(User *u, std::vector<std::string> ¶ms) + CommandReturn DoList(User *u, std::vector<std::string> ¶ms) { int sent_header = 0; const char *nick = params.size() > 1 ? params[1].c_str() : NULL; @@ -199,7 +199,7 @@ class CommandOSOper : public Command return MOD_CONT; } - CommandResult DoClear(User *u, std::vector<std::string> ¶ms) + CommandReturn DoClear(User *u, std::vector<std::string> ¶ms) { if (!is_services_root(u)) { @@ -224,7 +224,7 @@ class CommandOSOper : public Command this->help_param1 = s_NickServ; } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); diff --git a/src/core/os_quit.c b/src/core/os_quit.c index 60e045d3e..58686ed9d 100644 --- a/src/core/os_quit.c +++ b/src/core/os_quit.c @@ -24,7 +24,7 @@ class CommandOSQuit : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { quitmsg = new char[28 + strlen(u->nick)]; if (!quitmsg) diff --git a/src/core/os_raw.c b/src/core/os_raw.c index 142fbb73b..f7b810845 100644 --- a/src/core/os_raw.c +++ b/src/core/os_raw.c @@ -22,7 +22,7 @@ class CommandOSRaw : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *text = params[0].c_str(); send_cmd(NULL, "%s", text); diff --git a/src/core/os_reload.c b/src/core/os_reload.c index 1e0cf7223..6409ab368 100644 --- a/src/core/os_reload.c +++ b/src/core/os_reload.c @@ -24,7 +24,7 @@ class CommandOSReload : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { if (!read_config(1)) { diff --git a/src/core/os_restart.c b/src/core/os_restart.c index 9c9e9b227..48ebafb8b 100644 --- a/src/core/os_restart.c +++ b/src/core/os_restart.c @@ -24,7 +24,7 @@ class CommandOSRestart : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { #ifdef SERVICES_BIN quitmsg = new char[31 + strlen(u->nick)]; diff --git a/src/core/os_session.c b/src/core/os_session.c index 955d3f2aa..44a123c2a 100644 --- a/src/core/os_session.c +++ b/src/core/os_session.c @@ -20,7 +20,7 @@ void myOperServHelp(User *u); class CommandOSSession : public Command { private: - CommandResult DoList(User *u, std::vector<std::string> ¶ms) + CommandReturn DoList(User *u, std::vector<std::string> ¶ms) { Session *session; int mincount; @@ -45,7 +45,7 @@ class CommandOSSession : public Command return MOD_CONT; } - CommandResult DoView(User *u, std::vector<std::string> ¶ms) + CommandReturn DoView(User *u, std::vector<std::string> ¶ms) { const char *param = params[1].c_str(); Session *session = findsession(param); @@ -64,7 +64,7 @@ class CommandOSSession : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); @@ -101,7 +101,7 @@ class CommandOSSession : public Command class CommandOSException : public Command { private: - CommandResult DoAdd(User *u, std::vector<std::string> ¶ms) + CommandReturn DoAdd(User *u, std::vector<std::string> ¶ms) { const char *mask, *expiry, *limitstr; char reason[BUFSIZE]; @@ -174,7 +174,7 @@ class CommandOSException : public Command return MOD_CONT; } - CommandResult DoDel(User *u, std::vector<std::string> ¶ms) + CommandReturn DoDel(User *u, std::vector<std::string> ¶ms) { const char *mask = params.size() > 1 ? params[1].c_str() : NULL; int i; @@ -233,7 +233,7 @@ class CommandOSException : public Command return MOD_CONT; } - CommandResult DoMove(User *u, std::vector<std::string> ¶ms) + CommandReturn DoMove(User *u, std::vector<std::string> ¶ms) { Exception *exception; const char *n1str = params.size() > 1 ? params[1].c_str() : NULL; /* From position */ @@ -284,7 +284,7 @@ class CommandOSException : public Command return MOD_CONT; } - CommandResult DoList(User *u, std::vector<std::string> ¶ms) + CommandReturn DoList(User *u, std::vector<std::string> ¶ms) { int sent_header = 0; expire_exceptions(); @@ -306,7 +306,7 @@ class CommandOSException : public Command return MOD_CONT; } - CommandResult DoView(User *u, std::vector<std::string> ¶ms) + CommandReturn DoView(User *u, std::vector<std::string> ¶ms) { int sent_header = 0; expire_exceptions(); @@ -333,7 +333,7 @@ class CommandOSException : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); char *mask, *reason, *expiry, *limitstr; diff --git a/src/core/os_set.c b/src/core/os_set.c index 769dfbd6a..fa5d163a6 100644 --- a/src/core/os_set.c +++ b/src/core/os_set.c @@ -20,7 +20,7 @@ void myOperServHelp(User *u); class CommandOSSet : public Command { private: - CommandResult DoList(User *u, std::vector<std::string> ¶ms) + CommandReturn DoList(User *u, std::vector<std::string> ¶ms) { int index; @@ -38,7 +38,7 @@ class CommandOSSet : public Command return MOD_CONT; } - CommandResult DoSetIgnore(User *u, std::vector<std::string> ¶ms) + CommandReturn DoSetIgnore(User *u, std::vector<std::string> ¶ms) { const char *setting = params.size() > 1 ? params[1].c_str() : NULL; @@ -64,7 +64,7 @@ class CommandOSSet : public Command return MOD_CONT; } - CommandResult DoSetReadOnly(User *u, std::vector<std::string> ¶ms) + CommandReturn DoSetReadOnly(User *u, std::vector<std::string> ¶ms) { const char *setting = params.size() > 1 ? params[1].c_str() : NULL; @@ -94,7 +94,7 @@ class CommandOSSet : public Command return MOD_CONT; } - CommandResult DoSetLogChan(User *u, std::vector<std::string> ¶ms) + CommandReturn DoSetLogChan(User *u, std::vector<std::string> ¶ms) { const char *setting = params.size() > 1 ? params[1].c_str() : NULL; Channel *c; @@ -136,7 +136,7 @@ class CommandOSSet : public Command return MOD_CONT; } - CommandResult DoSetSuperAdmin(User *u, std::vector<std::string> ¶ms) + CommandReturn DoSetSuperAdmin(User *u, std::vector<std::string> ¶ms) { const char *setting = params.size() > 1 ? params[1].c_str() : NULL; @@ -173,7 +173,7 @@ class CommandOSSet : public Command return MOD_CONT; } - CommandResult DoSetDebug(User *u, std::vector<std::string> ¶ms) + CommandReturn DoSetDebug(User *u, std::vector<std::string> ¶ms) { const char *setting = params.size() > 1 ? params[1].c_str() : NULL; @@ -207,7 +207,7 @@ class CommandOSSet : public Command return MOD_CONT; } - CommandResult DoSetNoExpire(User *u, std::vector<std::string> ¶ms) + CommandReturn DoSetNoExpire(User *u, std::vector<std::string> ¶ms) { const char *setting = params.size() > 1 ? params[1].c_str() : NULL; @@ -239,7 +239,7 @@ class CommandOSSet : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { char *option = params[0].c_str(); char *setting = strtok(NULL, " "); diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c index 3c72d2711..b79e082c7 100644 --- a/src/core/os_sgline.c +++ b/src/core/os_sgline.c @@ -24,7 +24,7 @@ int sgline_list(int number, SXLine *sx, User *u, int *sent_header); class CommandOSSGLine : public Command { private: - CommandResult OnAdd(User *u, std::vector<std::string> ¶ms) + CommandReturn OnAdd(User *u, std::vector<std::string> ¶ms) { int deleted = 0, last_param = 2; const char *param; @@ -135,7 +135,7 @@ class CommandOSSGLine : public Command return MOD_CONT; } - CommandResult OnDel(User *u, std::vector<std::string> ¶ms) + CommandReturn OnDel(User *u, std::vector<std::string> ¶ms) { const char *mask; int res = 0; @@ -185,7 +185,7 @@ class CommandOSSGLine : public Command return MOD_CONT; } - CommandResult OnList(User *u, std::vector<std::string> ¶ms) + CommandReturn OnList(User *u, std::vector<std::string> ¶ms) { const char *mask; int res, sent_header = 0; @@ -227,7 +227,7 @@ class CommandOSSGLine : public Command return MOD_CONT; } - CommandResult OnView(User *u, std::vector<std::string> ¶ms) + CommandReturn OnView(User *u, std::vector<std::string> ¶ms) { const char *mask; int res, sent_header = 0; @@ -268,7 +268,7 @@ class CommandOSSGLine : public Command return MOD_CONT; } - CommandResult OnClear(User *u, std::vector<std::string> ¶ms) + CommandReturn OnClear(User *u, std::vector<std::string> ¶ms) { slist_clear(&sglines, 1); notice_lang(s_OperServ, u, OPER_SGLINE_CLEAR); @@ -278,7 +278,7 @@ class CommandOSSGLine : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c index 1d8c874d6..4dc8728e3 100644 --- a/src/core/os_shutdown.c +++ b/src/core/os_shutdown.c @@ -24,7 +24,7 @@ class CommandOSShutdown : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { quitmsg = new char[32 + strlen(u->nick)]; if (!quitmsg) diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c index 2de07f9c2..5a8f8f1af 100644 --- a/src/core/os_sqline.c +++ b/src/core/os_sqline.c @@ -24,7 +24,7 @@ int sqline_list(int number, SXLine *sx, User *u, int *sent_header); class CommandOSSQLine : public Command { private: - CommandResult DoAdd(User *u, std::vector<std::string> ¶ms) + CommandReturn DoAdd(User *u, std::vector<std::string> ¶ms) { int deleted = 0, last_param = 2; const char *expiry, *mask; @@ -128,7 +128,7 @@ class CommandOSSQLine : public Command return MOD_CONT; } - CommandResult DoDel(User *u, std::vector<std::string> ¶ms) + CommandReturn DoDel(User *u, std::vector<std::string> ¶ms) { const char *mask; int res = 0; @@ -178,7 +178,7 @@ class CommandOSSQLine : public Command return MOD_CONT; } - CommandResult DoList(User *u, std::vector<std::string> ¶ms) + CommandReturn DoList(User *u, std::vector<std::string> ¶ms) { const char *mask; int res, sent_header = 0; @@ -221,7 +221,7 @@ class CommandOSSQLine : public Command return MOD_CONT; } - CommandResult DoView(User *u, std::vector<std::string> ¶ms) + CommandReturn DoView(User *u, std::vector<std::string> ¶ms) { const char *mask; int res, sent_header = 0; @@ -262,7 +262,7 @@ class CommandOSSQLine : public Command return MOD_CONT; } - CommandResult DoClear(User *u, std::vector<std::string> ¶ms) + CommandReturn DoClear(User *u, std::vector<std::string> ¶ms) { slist_clear(&sqlines, 1); notice_lang(s_OperServ, u, OPER_SQLINE_CLEAR); @@ -274,7 +274,7 @@ class CommandOSSQLine : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); diff --git a/src/core/os_staff.c b/src/core/os_staff.c index 54bfafec8..a785ba7ef 100644 --- a/src/core/os_staff.c +++ b/src/core/os_staff.c @@ -26,7 +26,7 @@ class CommandOSStaff : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { int idx = 0; User *au = NULL; diff --git a/src/core/os_stats.c b/src/core/os_stats.c index aeaa02615..d4f57c848 100644 --- a/src/core/os_stats.c +++ b/src/core/os_stats.c @@ -21,7 +21,7 @@ void myOperServHelp(User *u); class CommandOSStats : public Command { private: - CommandResult DoStatsAkill(User *u, std::vector<std::string> ¶ms) + CommandReturn DoStatsAkill(User *u, std::vector<std::string> ¶ms) { int timeout; /* AKILLs */ @@ -104,7 +104,7 @@ class CommandOSStats : public Command return MOD_CONT; } - CommandResult DoStatsReset(User *u, std::vector<std::string> ¶ms) + CommandReturn DoStatsReset(User *u, std::vector<std::string> ¶ms) { if (is_services_admin(u)) { @@ -116,7 +116,7 @@ class CommandOSStats : public Command return MOD_CONT; } - CommandResult DoStatsUptime(User *u, std::vector<std::string> ¶ms) + CommandReturn DoStatsUptime(User *u, std::vector<std::string> ¶ms) { notice_lang(s_OperServ, u, OPER_STATS_CURRENT_USERS, usercnt, opcnt); tm = localtime(&maxusertime); @@ -181,7 +181,7 @@ class CommandOSStats : public Command } } - CommandResult DoStatsUplink(User *u, std::vector<std::string> ¶ms) + CommandReturn DoStatsUplink(User *u, std::vector<std::string> ¶ms) { buf[0] = '\0'; buflen = 511; /* How confusing, this is the amount of space left! */ @@ -219,7 +219,7 @@ class CommandOSStats : public Command return MOD_CONT; } - CommandResult DoStatsMemory(User *u, std::vector<std::string> ¶ms) + CommandReturn DoStatsMemory(User *u, std::vector<std::string> ¶ms) { long count, mem; @@ -256,7 +256,7 @@ class CommandOSStats : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { time_t uptime = time(NULL) - start_time; const char *extra = params.size() ? params[0].c_str() : NULL; diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c index 28ef6f593..ab358a8c9 100644 --- a/src/core/os_svsnick.c +++ b/src/core/os_svsnick.c @@ -24,7 +24,7 @@ class CommandOSSVSNick : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params[0].c_str(); const char *newnick = params[1].c_str(); diff --git a/src/core/os_szline.c b/src/core/os_szline.c index 22d2eabde..8c9cc241d 100644 --- a/src/core/os_szline.c +++ b/src/core/os_szline.c @@ -24,7 +24,7 @@ int szline_list(int number, SXLine *sx, User *u, int *sent_header); class CommandOSSZLine : public Command { private: - CommandResult DoAdd(User *u, std::vector<std::string> ¶ms) + CommandReturn DoAdd(User *u, std::vector<std::string> ¶ms) { int deleted = 0, last_param = 2; const char *expiry, *mask; @@ -128,7 +128,7 @@ class CommandOSSZLine : public Command return MOD_CONT; } - CommandResult DoDel(User *u, std::vector<std::string> ¶ms) + CommandReturn DoDel(User *u, std::vector<std::string> ¶ms) { char *mask; int res = 0; @@ -179,7 +179,7 @@ class CommandOSSZLine : public Command return MOD_CONT; } - CommandResult DoList(User *u, std::vector<std::string> ¶ms) + CommandReturn DoList(User *u, std::vector<std::string> ¶ms) { char *mask; int res, sent_header = 0; @@ -220,7 +220,7 @@ class CommandOSSZLine : public Command return MOD_CONT; } - CommandResult DoView(User *u, std::vector<std::string> ¶ms) + CommandReturn DoView(User *u, std::vector<std::string> ¶ms) { char *mask; int res, sent_header = 0; @@ -261,7 +261,7 @@ class CommandOSSZLine : public Command return MOD_CONT; } - CommandResult DoClear(User *u, std::vector<std::string> ¶ms) + CommandReturn DoClear(User *u, std::vector<std::string> ¶ms) { slist_clear(&szlines, 1); notice_lang(s_OperServ, u, OPER_SZLINE_CLEAR); @@ -273,7 +273,7 @@ class CommandOSSZLine : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); diff --git a/src/core/os_umode.c b/src/core/os_umode.c index ade20bcea..e3701ee3d 100644 --- a/src/core/os_umode.c +++ b/src/core/os_umode.c @@ -24,7 +24,7 @@ class CommandOSUMode : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params[0].c_str(); const char *modes = params[1].c_str(); diff --git a/src/core/os_update.c b/src/core/os_update.c index a85e0c219..e59d2f47f 100644 --- a/src/core/os_update.c +++ b/src/core/os_update.c @@ -24,7 +24,7 @@ class CommandOSUpdate : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { notice_lang(s_OperServ, u, OPER_UPDATING); save_data = 1; diff --git a/src/core/ss_main.c b/src/core/ss_main.c index d2f2b01ea..3b266a849 100644 --- a/src/core/ss_main.c +++ b/src/core/ss_main.c @@ -26,7 +26,7 @@ class CommandSSHelp : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { ircdproto->SendMessage(statserv, u->nick, "This is a test of the emergency StatServ system."); return MOD_CONT; diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c index 67526348a..5e28f09a5 100644 --- a/src/modules/cs_appendtopic.c +++ b/src/modules/cs_appendtopic.c @@ -59,7 +59,7 @@ class CommandCSAppendTopic : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *chan = params[0].c_str(); const char *newtopic = params[1].c_str(); diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c index 058db9aca..ffdbb18d4 100644 --- a/src/modules/cs_enforce.c +++ b/src/modules/cs_enforce.c @@ -172,7 +172,7 @@ class CommandCSEnforce : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *chan = params[0].c_str(); const char *what = params.size() > 1 ? params[1].c_str() : NULL; diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c index d8834c156..51ef10b2c 100644 --- a/src/modules/cs_tban.c +++ b/src/modules/cs_tban.c @@ -45,7 +45,7 @@ class CommandCSTBan : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { char mask[BUFSIZE]; Channel *c; diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c index a1471705a..647d28a33 100644 --- a/src/modules/hs_request.c +++ b/src/modules/hs_request.c @@ -79,7 +79,7 @@ class CommandHSRequest : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { char *nick; const char *rawhostmask = params[1].c_str(); @@ -211,7 +211,7 @@ class CommandHSActivate : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params[0].c_str(); NickAlias *na; @@ -273,7 +273,7 @@ class CommandHSReject : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params[0].c_str(); const char *reason = params.size() > 1 ? params[1].c_str() : NULL; @@ -329,7 +329,7 @@ class CommandHSReject : public Command class CommandHSList : public Command { private: - CommandResult DoList(User *u, std::vector<std::string> ¶ms) + CommandReturn DoList(User *u, std::vector<std::string> ¶ms) { struct tm *tm; char buf[BUFSIZE]; @@ -363,7 +363,7 @@ class CommandHSList : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *key = params[0].c_str(); @@ -386,7 +386,7 @@ class CommandHSWaiting : public CommandHSList { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { return this->DoList(u, params); } @@ -411,7 +411,7 @@ class CommandNSDrop : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { HostCore *tmp; bool found = false; diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c index b2e870c88..c2be798c8 100644 --- a/src/modules/ns_maxemail.c +++ b/src/modules/ns_maxemail.c @@ -37,7 +37,7 @@ class CommandNSRegister : public Command { } - CommandResult(User *u, std::vector<std::string> ¶ms) + CommandReturn(User *u, std::vector<std::string> ¶ms) { return check_email_limit_reached(params[1].c_str(), u); } @@ -55,7 +55,7 @@ class CommandNSSet : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *set = params[0].c_str(); const char *email = params[1].c_str(); diff --git a/src/modules/os_info.c b/src/modules/os_info.c index c7560318d..d68cd0f96 100644 --- a/src/modules/os_info.c +++ b/src/modules/os_info.c @@ -58,7 +58,7 @@ static Module *me; class CommandNSOInfo : public Command { private: - CommandResult DoAdd(User *u, std::vector<std::string> ¶ms) + CommandReturn DoAdd(User *u, std::vector<std::string> ¶ms) { const char *nick = params[1].c_str(); const char *info = params.size() > 2 ? params[2].c_str() : NULL; @@ -83,7 +83,7 @@ class CommandNSOInfo : public Command return MOD_CONT; } - CommandResult DoDel(User *u, std::vector<std::string> ¶ms) + CommandReturn DoDel(User *u, std::vector<std::string> ¶ms) { const char *nick = params[1].c_str(); NickAlias *na = NULL; @@ -110,7 +110,7 @@ class CommandNSOInfo : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); @@ -145,7 +145,7 @@ class CommandNSInfo : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *nick = params[0].c_str(); NickAlias *na = NULL; @@ -174,7 +174,7 @@ class CommandNSInfo : public Command class CommandCSOInfo : public Command { private: - CommandResult DoAdd(User *u, std::vector<std::string> ¶ms) + CommandReturn DoAdd(User *u, std::vector<std::string> ¶ms) { const char *chan = params[1].c_str(); const char *info = params.size() > 2 ? params[2].c_str() : NULL; @@ -198,7 +198,7 @@ class CommandCSOInfo : public Command return MOD_CONT; } - CommandResult DoDel(User *u, std::vector<std::string> ¶ms) + CommandReturn DoDel(User *u, std::vector<std::string> ¶ms) { const char *chan = params[1].c_str(); ChannelInfo *ci = NULL; @@ -224,7 +224,7 @@ class CommandCSOInfo : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { const char *cmd = params[0].c_str(); @@ -259,7 +259,7 @@ class CommandCSInfo : public Command { } - CommandResult Execute(User *u, std::vector<std::string> ¶ms) + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { char *chan = params[0].c_str(); ChannelInfo *ci = NULL; |