diff options
| author | Terry Wilson <twilson@digium.com> | 2012-02-13 17:27:06 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-02-13 17:27:06 +0000 |
| commit | 34c55e8e7c87a92181fca3e0101dc456eef2475b (patch) | |
| tree | ad27fca98a7df582348e14b0aaa42f0065cdef99 /apps/app_directory.c | |
| parent | a955a4770fcdd7874e1337e7df694bcd293e020e (diff) | |
Opaquify char * and char[] in ast_channel
Review: https://reviewboard.asterisk.org/r/1733/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@354968 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_directory.c')
| -rw-r--r-- | apps/app_directory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_directory.c b/apps/app_directory.c index a4ec93e4c..4db404cff 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -248,9 +248,9 @@ static int compare(const char *text, const char *template) static int goto_exten(struct ast_channel *chan, const char *dialcontext, char *ext) { - if (!ast_goto_if_exists(chan, S_OR(dialcontext, chan->context), ext, 1) || - (!ast_strlen_zero(chan->macrocontext) && - !ast_goto_if_exists(chan, chan->macrocontext, ext, 1))) { + if (!ast_goto_if_exists(chan, S_OR(dialcontext, ast_channel_context(chan)), ext, 1) || + (!ast_strlen_zero(ast_channel_macrocontext(chan)) && + !ast_goto_if_exists(chan, ast_channel_macrocontext(chan), ext, 1))) { return 0; } else { ast_log(LOG_WARNING, "Can't find extension '%s' in current context. " @@ -292,7 +292,7 @@ static int select_entry(struct ast_channel *chan, const char *dialcontext, const if (ast_test_flag(flags, OPT_FROMVOICEMAIL)) { /* We still want to set the exten though */ - ast_copy_string(chan->exten, item->exten, sizeof(chan->exten)); + ast_channel_exten_set(chan, item->exten); } else if (ast_goto_if_exists(chan, S_OR(dialcontext, item->context), item->exten, 1)) { ast_log(LOG_WARNING, "Can't find extension '%s' in context '%s'. " |