From e8980b89cb236fe2b8ec664498350eec313b2818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= Date: Mon, 27 Jan 2014 03:06:11 +0200 Subject: [PATCH] ns_ajoin: deduplicate the syntax error messages The one in 'HELP' was missing a mention of CLEAR. Closes atheme#269. --- ns_ajoin.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/ns_ajoin.c b/ns_ajoin.c index 22da235..246bfef 100644 --- a/ns_ajoin.c +++ b/ns_ajoin.c @@ -19,6 +19,12 @@ DECLARE_MODULE_V1 static void ajoin_on_identify(user_t *u); +static void ns_cmd_ajoin_syntaxerr(sourceinfo_t *si) +{ + command_fail(si, fault_badparams, STR_INSUFFICIENT_PARAMS, "AJOIN"); + command_fail(si, fault_badparams, "Syntax: AJOIN [#channel]"); +} + static void ns_cmd_ajoin(sourceinfo_t *si, int parc, char *parv[]) { char buf[512]; @@ -26,11 +32,7 @@ static void ns_cmd_ajoin(sourceinfo_t *si, int parc, char *parv[]) metadata_t *md; if (!parv[0]) - { - command_fail(si, fault_badparams, STR_INSUFFICIENT_PARAMS, "AJOIN"); - command_fail(si, fault_badparams, "Syntax: AJOIN [#channel]"); - return; - } + return ns_cmd_ajoin_syntaxerr(si); if (!strcasecmp(parv[0], "LIST")) { @@ -51,11 +53,7 @@ static void ns_cmd_ajoin(sourceinfo_t *si, int parc, char *parv[]) else if (!strcasecmp(parv[0], "ADD")) { if (!parv[1]) - { - command_fail(si, fault_badparams, STR_INSUFFICIENT_PARAMS, "AJOIN"); - command_fail(si, fault_badparams, "Syntax: AJOIN [#channel]"); - return; - } + return ns_cmd_ajoin_syntaxerr(si); if ((md = metadata_find(si->smu, "private:autojoin"))) { @@ -99,11 +97,7 @@ static void ns_cmd_ajoin(sourceinfo_t *si, int parc, char *parv[]) else if (!strcasecmp(parv[0], "DEL")) { if (!parv[1]) - { - command_fail(si, fault_badparams, STR_INSUFFICIENT_PARAMS, "AJOIN"); - command_fail(si, fault_badparams, "Syntax: AJOIN [#channel]"); - return; - } + return ns_cmd_ajoin_syntaxerr(si); if (!(md = metadata_find(si->smu, "private:autojoin"))) {