kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

In handle_cli_dialplan_add_extension, const char pointer *into_context is used instead of a->argv[5] to improve readability.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@312680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2011-04-04 17:37:47 +00:00
parent 7fa7d9c36b
commit 3c02c09162
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pbx/pbx_config.c
View File

@@ -905,6 +905,7 @@ static char *handle_cli_dialplan_add_extension(struct ast_cli_entry *e, int cmd,
int iprior = -2; int iprior = -2;
char *cidmatch, *app, *app_data; char *cidmatch, *app, *app_data;
char *start, *end; char *start, *end;
const char *into_context;
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
@@ -969,19 +970,21 @@ static char *handle_cli_dialplan_add_extension(struct ast_cli_entry *e, int cmd,
if (!exten || !prior || !app || (!app_data && iprior != PRIORITY_HINT)) if (!exten || !prior || !app || (!app_data && iprior != PRIORITY_HINT))
return CLI_SHOWUSAGE; return CLI_SHOWUSAGE;
if (!ast_context_find(a->argv[5])) { into_context = a->argv[5];
ast_cli(a->fd, "Context '%s' did not exist prior to add extension - the context will be created.\n", a->argv[5]);
if (!ast_context_find(into_context)) {
ast_cli(a->fd, "Context '%s' did not exist prior to add extension - the context will be created.\n", into_context);
} }
if (!ast_context_find_or_create(NULL, NULL, a->argv[5], registrar)) { if (!ast_context_find_or_create(NULL, NULL, into_context, registrar)) {
ast_cli(a->fd, "ast_context_find_or_create() failed\n"); ast_cli(a->fd, "ast_context_find_or_create() failed\n");
ast_cli(a->fd, "Failed to add '%s,%s,%s,%s' extension into '%s' context\n", exten, prior, app, app_data, a->argv[5]); ast_cli(a->fd, "Failed to add '%s,%s,%s,%s' extension into '%s' context\n", exten, prior, app, app_data, into_context);
return CLI_FAILURE; return CLI_FAILURE;
} }
if (!app_data) if (!app_data)
app_data=""; app_data="";
if (ast_add_extension(a->argv[5], a->argc == 7 ? 1 : 0, exten, iprior, NULL, cidmatch, app, if (ast_add_extension(into_context, a->argc == 7 ? 1 : 0, exten, iprior, NULL, cidmatch, app,
(void *)strdup(app_data), ast_free_ptr, registrar)) { (void *)strdup(app_data), ast_free_ptr, registrar)) {
switch (errno) { switch (errno) {
case ENOMEM: case ENOMEM:
@@ -993,17 +996,17 @@ static char *handle_cli_dialplan_add_extension(struct ast_cli_entry *e, int cmd,
break; break;
case ENOENT: case ENOENT:
ast_cli(a->fd, "No existence of '%s' context\n", a->argv[5]); ast_cli(a->fd, "No existence of '%s' context\n", into_context);
break; break;
case EEXIST: case EEXIST:
ast_cli(a->fd, "Extension %s@%s with priority %s already exists\n", ast_cli(a->fd, "Extension %s@%s with priority %s already exists\n",
exten, a->argv[5], prior); exten, into_context, prior);
break; break;
default: default:
ast_cli(a->fd, "Failed to add '%s,%s,%s,%s' extension into '%s' context\n", ast_cli(a->fd, "Failed to add '%s,%s,%s,%s' extension into '%s' context\n",
exten, prior, app, app_data, a->argv[5]); exten, prior, app, app_data, into_context);
break; break;
} }
return CLI_FAILURE; return CLI_FAILURE;
@@ -1011,10 +1014,10 @@ static char *handle_cli_dialplan_add_extension(struct ast_cli_entry *e, int cmd,
if (a->argc == 7) if (a->argc == 7)
ast_cli(a->fd, "Extension %s@%s (%s) replace by '%s,%s,%s,%s'\n", ast_cli(a->fd, "Extension %s@%s (%s) replace by '%s,%s,%s,%s'\n",
exten, a->argv[5], prior, exten, prior, app, app_data); exten, into_context, prior, exten, prior, app, app_data);
else else
ast_cli(a->fd, "Extension '%s,%s,%s,%s' added into '%s' context\n", ast_cli(a->fd, "Extension '%s,%s,%s,%s' added into '%s' context\n",
exten, prior, app, app_data, a->argv[5]); exten, prior, app, app_data, into_context);
return CLI_SUCCESS; return CLI_SUCCESS;
} }