diff options
| author | Luigi Rizzo <rizzo@icir.org> | 2006-11-03 22:01:34 +0000 |
|---|---|---|
| committer | Luigi Rizzo <rizzo@icir.org> | 2006-11-03 22:01:34 +0000 |
| commit | c3a6bbddb8278889c10a19dd149155e8facb4770 (patch) | |
| tree | 7d2d905684e2f3f6f34ea9d6f92a8c4d3643acfc | |
| parent | 534da0ecfd8a9a0d7895f93529635b9fb7adc193 (diff) | |
remove redundant checks
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47170 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | apps/app_dial.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index ad62372e9..8e383649b 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -710,7 +710,8 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l 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)) { const char *context = pbx_builtin_getvar_helper(in, "EXITCONTEXT"); 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 */ - 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) ast_log(LOG_WARNING, "Unable to send URL\n"); |