diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-02-13 21:36:26 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-02-13 21:36:26 +0000 |
| commit | d8af1a48824537495db92b8c0c43ce5388032729 (patch) | |
| tree | 26b528441f5c8bfa4c03f519d7d8f6b8f79be17f /channels/chan_misdn.c | |
| parent | be2ac1b3dd511129917147a52f5775bf56ab50df (diff) | |
Fix compile error from most recent ast_channel opaquification installment.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@355055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_misdn.c')
| -rw-r--r-- | channels/chan_misdn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 1402c8320..7b3d448c2 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -7280,10 +7280,10 @@ static struct ast_frame *process_ast_dsp(struct chan_list *tmp, struct ast_frame switch (tmp->faxdetect) { case 1: if (strcmp(ast_channel_exten(ast), "fax")) { - char *context; + const char *context; char context_tmp[BUFFERSIZE]; misdn_cfg_get(tmp->bc->port, MISDN_CFG_FAXDETECT_CONTEXT, &context_tmp, sizeof(context_tmp)); - context = ast_strlen_zero(context_tmp) ? (ast_strlen_zero(ast_channel_macrocontext(ast)) ? ast_channel_context(ast) : ast_channel_macrocontext(ast)) : context_tmp; + context = S_OR(context_tmp, S_OR(ast_channel_macrocontext(ast), ast_channel_context(ast))); if (ast_exists_extension(ast, context, "fax", 1, S_COR(ast->caller.id.number.valid, ast->caller.id.number.str, NULL))) { ast_verb(3, "Redirecting %s to fax extension (context:%s)\n", ast_channel_name(ast), context); |