From ebaf59a656ef94e19332c08e0d0562b8cbe59f65 Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Fri, 24 Feb 2012 00:32:20 +0000 Subject: Opaquification for ast_format structs in struct ast_channel Review: https://reviewboard.asterisk.org/r/1770/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@356573 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/pbx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'main/pbx.c') diff --git a/main/pbx.c b/main/pbx.c index 626d6e8aa..bbf5ad74b 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -8347,8 +8347,8 @@ int ast_async_goto(struct ast_channel *chan, const char *context, const char *ex tmpvars.name = ast_strdupa(ast_channel_name(chan)); tmpvars.amaflags = ast_channel_amaflags(chan); tmpvars.state = ast_channel_state(chan); - ast_format_copy(&tmpvars.writeformat, &chan->writeformat); - ast_format_copy(&tmpvars.readformat, &chan->readformat); + ast_format_copy(&tmpvars.writeformat, ast_channel_writeformat(chan)); + ast_format_copy(&tmpvars.readformat, ast_channel_readformat(chan)); tmpvars.cdr = ast_channel_cdr(chan) ? ast_cdr_dup(ast_channel_cdr(chan)) : NULL; ast_channel_unlock(chan); @@ -8368,8 +8368,8 @@ int ast_async_goto(struct ast_channel *chan, const char *context, const char *ex } /* Make formats okay */ - ast_format_copy(&tmpchan->readformat, &tmpvars.readformat); - ast_format_copy(&tmpchan->writeformat, &tmpvars.writeformat); + ast_format_copy(ast_channel_readformat(tmpchan), &tmpvars.readformat); + ast_format_copy(ast_channel_writeformat(tmpchan), &tmpvars.writeformat); /* Setup proper location. Never hold another channel lock while calling this function. */ ast_explicit_goto(tmpchan, S_OR(context, tmpvars.context), S_OR(exten, tmpvars.exten), priority); -- cgit v1.2.3