mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-30 02:26:23 +00:00
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
This commit is contained in:
@@ -712,7 +712,7 @@ static int handle_context_add_include(int fd, int argc, char *argv[])
|
|||||||
if (argc != 5) return RESULT_SHOWUSAGE;
|
if (argc != 5) return RESULT_SHOWUSAGE;
|
||||||
|
|
||||||
/* third arg must be 'in' ... */
|
/* 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)) {
|
if (ast_context_add_include(argv[4], argv[2], registrar)) {
|
||||||
switch (errno) {
|
switch (errno) {
|
||||||
@@ -724,7 +724,7 @@ static int handle_context_add_include(int fd, int argc, char *argv[])
|
|||||||
|
|
||||||
case EEXIST:
|
case EEXIST:
|
||||||
ast_cli(fd, "Context '%s' already included in '%s' context\n",
|
ast_cli(fd, "Context '%s' already included in '%s' context\n",
|
||||||
argv[1], argv[3]); break;
|
argv[2], argv[4]); break;
|
||||||
|
|
||||||
case ENOENT:
|
case ENOENT:
|
||||||
case EINVAL:
|
case EINVAL:
|
||||||
@@ -733,14 +733,14 @@ static int handle_context_add_include(int fd, int argc, char *argv[])
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
ast_cli(fd, "Failed to include '%s' in '%s' context\n",
|
ast_cli(fd, "Failed to include '%s' in '%s' context\n",
|
||||||
argv[1], argv[3]); break;
|
argv[2], argv[4]); break;
|
||||||
}
|
}
|
||||||
return RESULT_FAILURE;
|
return RESULT_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* show some info ... */
|
/* show some info ... */
|
||||||
ast_cli(fd, "Context '%s' included in '%s' context\n",
|
ast_cli(fd, "Context '%s' included in '%s' context\n",
|
||||||
argv[2], argv[3]);
|
argv[2], argv[4]);
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user