From 01594b899a1e10d1dfca09170cc1eb005515e494 Mon Sep 17 00:00:00 2001 From: russell Date: Wed, 4 Jun 2008 16:26:43 +0000 Subject: [PATCH] Make the "dialplan remove include" CLI command actually work. Also, tweak some formatting, and make the success message a little bit more clear. (closes AST-52) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@120371 614ede4d-c843-0410-af14-a771ab80d22e --- pbx/pbx_config.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 8083fda66..3d4a08c29 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -135,20 +135,23 @@ static int handle_context_dont_include_deprecated(int fd, int argc, char *argv[] static int handle_context_remove_include(int fd, int argc, char *argv[]) { - if (argc != 6) + if (argc != 6) { return RESULT_SHOWUSAGE; + } - if (strcmp(argv[4], "into")) + if (strcmp(argv[4], "from")) { return RESULT_SHOWUSAGE; + } if (!ast_context_remove_include(argv[5], argv[3], registrar)) { - ast_cli(fd, "We are not including '%s' into '%s' now\n", + ast_cli(fd, "The dialplan no longer includes '%s' into '%s'\n", argv[3], argv[5]); return RESULT_SUCCESS; } ast_cli(fd, "Failed to remove '%s' include from '%s' context\n", argv[3], argv[5]); + return RESULT_FAILURE; } -- 2.11.4.GIT