mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-20 03:59:01 +00:00
remove redundant checks
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47170 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -710,7 +710,8 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (f && (f->frametype == AST_FRAME_DTMF)) {
|
/* now f is guaranteed non-NULL */
|
||||||
|
if (f->frametype == AST_FRAME_DTMF) {
|
||||||
if (ast_test_flag(peerflags, OPT_DTMF_EXIT)) {
|
if (ast_test_flag(peerflags, OPT_DTMF_EXIT)) {
|
||||||
const char *context = pbx_builtin_getvar_helper(in, "EXITCONTEXT");
|
const char *context = pbx_builtin_getvar_helper(in, "EXITCONTEXT");
|
||||||
if (onedigit_goto(in, context, (char) f->subclass, 1)) {
|
if (onedigit_goto(in, context, (char) f->subclass, 1)) {
|
||||||
@@ -736,7 +737,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Forward HTML stuff */
|
/* Forward HTML stuff */
|
||||||
if (single && f && (f->frametype == AST_FRAME_HTML) && !ast_test_flag(outgoing, DIAL_NOFORWARDHTML))
|
if (single && (f->frametype == AST_FRAME_HTML) && !ast_test_flag(outgoing, DIAL_NOFORWARDHTML))
|
||||||
if(ast_channel_sendhtml(outgoing->chan, f->subclass, f->data, f->datalen) == -1)
|
if(ast_channel_sendhtml(outgoing->chan, f->subclass, f->data, f->datalen) == -1)
|
||||||
ast_log(LOG_WARNING, "Unable to send URL\n");
|
ast_log(LOG_WARNING, "Unable to send URL\n");
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user