From dc3ba8c2235db5c34bca5573aef5c56bfdb5882f Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Fri, 6 Jan 2006 00:34:40 +0000 Subject: [PATCH] Dumb error messages - "Context 'context' already included in 'in' context" git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7831 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- pbx/pbx_config.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 1bcb2f5150..42e43470af 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -712,7 +712,7 @@ static int handle_context_add_include(int fd, int argc, char *argv[]) if (argc != 5) return RESULT_SHOWUSAGE; /* third arg must be 'in' ... */ - if (strcmp(argv[3], "in")) return RESULT_SHOWUSAGE; + if (strcmp(argv[3], "in") && strcmp(argv[3], "into")) return RESULT_SHOWUSAGE; if (ast_context_add_include(argv[4], argv[2], registrar)) { switch (errno) { @@ -724,7 +724,7 @@ static int handle_context_add_include(int fd, int argc, char *argv[]) case EEXIST: ast_cli(fd, "Context '%s' already included in '%s' context\n", - argv[1], argv[3]); break; + argv[2], argv[4]); break; case ENOENT: case EINVAL: @@ -733,14 +733,14 @@ static int handle_context_add_include(int fd, int argc, char *argv[]) default: ast_cli(fd, "Failed to include '%s' in '%s' context\n", - argv[1], argv[3]); break; + argv[2], argv[4]); break; } return RESULT_FAILURE; } /* show some info ... */ ast_cli(fd, "Context '%s' included in '%s' context\n", - argv[2], argv[3]); + argv[2], argv[4]); return RESULT_SUCCESS; }