diff options
| author | Adam <Adam@anope.org> | 2010-08-17 19:27:37 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-08-17 19:27:37 -0400 |
| commit | e65d8b2f3dfdb40858259b3bb48ef6998c31e62f (patch) | |
| tree | fd845bdef5664d025ab19c262ae2c5e9d23d7bb2 /modules/core/ms_cancel.cpp | |
| parent | 2575008baa5c9d0ca789680da1a3b81dc74786f7 (diff) | |
Rewrote the config reader to better handle invalid configs.
This prevents Anope from exploding when /os reload has errors.
Diffstat (limited to 'modules/core/ms_cancel.cpp')
| -rw-r--r-- | modules/core/ms_cancel.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/core/ms_cancel.cpp b/modules/core/ms_cancel.cpp index f246c02f5..60fd01ca2 100644 --- a/modules/core/ms_cancel.cpp +++ b/modules/core/ms_cancel.cpp @@ -29,13 +29,13 @@ class CommandMSCancel : public Command MemoInfo *mi; if (!u->IsRecognized()) - notice_lang(Config.s_MemoServ, u, NICK_IDENTIFY_REQUIRED, Config.s_NickServ.c_str()); + notice_lang(Config->s_MemoServ, u, NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str()); else if (!(mi = getmemoinfo(name, ischan, isforbid))) { if (isforbid) - notice_lang(Config.s_MemoServ, u, ischan ? CHAN_X_FORBIDDEN : NICK_X_FORBIDDEN, name.c_str()); + notice_lang(Config->s_MemoServ, u, ischan ? CHAN_X_FORBIDDEN : NICK_X_FORBIDDEN, name.c_str()); else - notice_lang(Config.s_MemoServ, u, ischan ? CHAN_X_NOT_REGISTERED : NICK_X_NOT_REGISTERED, name.c_str()); + notice_lang(Config->s_MemoServ, u, ischan ? CHAN_X_NOT_REGISTERED : NICK_X_NOT_REGISTERED, name.c_str()); } else { @@ -46,29 +46,29 @@ class CommandMSCancel : public Command { FOREACH_MOD(I_OnMemoDel, OnMemoDel(findnick(name)->nc, mi, mi->memos[i]->number)); delmemo(mi, mi->memos[i]->number); - notice_lang(Config.s_MemoServ, u, MEMO_CANCELLED, name.c_str()); + notice_lang(Config->s_MemoServ, u, MEMO_CANCELLED, name.c_str()); return MOD_CONT; } - notice_lang(Config.s_MemoServ, u, MEMO_CANCEL_NONE); + notice_lang(Config->s_MemoServ, u, MEMO_CANCEL_NONE); } return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config.s_MemoServ, u, MEMO_HELP_CANCEL); + notice_help(Config->s_MemoServ, u, MEMO_HELP_CANCEL); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config.s_MemoServ, u, "CANCEL", MEMO_CANCEL_SYNTAX); + syntax_error(Config->s_MemoServ, u, "CANCEL", MEMO_CANCEL_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config.s_MemoServ, u, MEMO_HELP_CMD_CANCEL); + notice_lang(Config->s_MemoServ, u, MEMO_HELP_CMD_CANCEL); } }; |