diff options
| author | Sean Bright <sean@malleable.com> | 2012-03-08 17:48:14 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2012-03-08 17:48:14 +0000 |
| commit | 4657b016ad8250c999f3fad110edf0a1f8c74acd (patch) | |
| tree | 87564937c2490e7222d357ada2f1381fcd1b1aad /apps/app_dial.c | |
| parent | 99bd5b1e2e70160b2d3f6dcbd122b06654c17788 (diff) | |
Resolve a few more cases of variable shadowing.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358691 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index d2e9e6f3d..46330fc65 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -2697,11 +2697,11 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast if (gosub_args) { res9 = pbx_exec(peer, theapp, gosub_args); if (!res9) { - struct ast_pbx_args args; + struct ast_pbx_args pbx_args; /* A struct initializer fails to compile for this case ... */ - memset(&args, 0, sizeof(args)); - args.no_hangup_chan = 1; - ast_pbx_run_args(peer, &args); + memset(&pbx_args, 0, sizeof(pbx_args)); + pbx_args.no_hangup_chan = 1; + ast_pbx_run_args(peer, &pbx_args); } ast_free(gosub_args); ast_debug(1, "Gosub exited with status %d\n", res9); @@ -2869,9 +2869,9 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast replace_macro_delimiter(opt_args[OPT_ARG_CALLEE_GO_ON]); ast_parseable_goto(peer, opt_args[OPT_ARG_CALLEE_GO_ON]); } else { /* F() */ - int res; - res = ast_goto_if_exists(peer, ast_channel_context(chan), ast_channel_exten(chan), (ast_channel_priority(chan)) + 1); - if (res == AST_PBX_GOTO_FAILED) { + int goto_res; + goto_res = ast_goto_if_exists(peer, ast_channel_context(chan), ast_channel_exten(chan), (ast_channel_priority(chan)) + 1); + if (goto_res == AST_PBX_GOTO_FAILED) { ast_hangup(peer); goto out; } |