From 99cae5b7508f30a308afbbacf92ad306a30f68df Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Tue, 24 Jan 2012 20:12:09 +0000 Subject: Opaquify channel stringfields Continue channel opaque-ification by wrapping all of the stringfields. Eventually, we will restrict what can actually set these variables, but the purpose for now is to hide the implementation and keep people from adding code that directly accesses the channel structure. Semantic changes will follow afterward. Review: https://reviewboard.asterisk.org/r/1661/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@352348 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_privacy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/app_privacy.c') diff --git a/apps/app_privacy.c b/apps/app_privacy.c index 6b191771c..6c2c95814 100644 --- a/apps/app_privacy.c +++ b/apps/app_privacy.c @@ -136,7 +136,7 @@ static int privacy_exec(struct ast_channel *chan, const char *data) /* Play unidentified call */ res = ast_safe_sleep(chan, 1000); if (!res) { - res = ast_streamfile(chan, "privacy-unident", chan->language); + res = ast_streamfile(chan, "privacy-unident", ast_channel_language(chan)); } if (!res) { res = ast_waitstream(chan, ""); @@ -145,7 +145,7 @@ static int privacy_exec(struct ast_channel *chan, const char *data) /* Ask for 10 digit number, give 3 attempts */ for (retries = 0; retries < maxretries; retries++) { if (!res) { - res = ast_streamfile(chan, "privacy-prompt", chan->language); + res = ast_streamfile(chan, "privacy-prompt", ast_channel_language(chan)); } if (!res) { res = ast_waitstream(chan, ""); @@ -164,7 +164,7 @@ static int privacy_exec(struct ast_channel *chan, const char *data) /* if we have a checkcontext argument, do pattern matching */ if (!ast_strlen_zero(args.checkcontext)) { if (!ast_exists_extension(NULL, args.checkcontext, phone, 1, NULL)) { - res = ast_streamfile(chan, "privacy-incorrect", chan->language); + res = ast_streamfile(chan, "privacy-incorrect", ast_channel_language(chan)); if (!res) { res = ast_waitstream(chan, ""); } @@ -175,7 +175,7 @@ static int privacy_exec(struct ast_channel *chan, const char *data) break; } } else { - res = ast_streamfile(chan, "privacy-incorrect", chan->language); + res = ast_streamfile(chan, "privacy-incorrect", ast_channel_language(chan)); if (!res) { res = ast_waitstream(chan, ""); } @@ -184,7 +184,7 @@ static int privacy_exec(struct ast_channel *chan, const char *data) /* Got a number, play sounds and send them on their way */ if ((retries < maxretries) && res >= 0) { - res = ast_streamfile(chan, "privacy-thankyou", chan->language); + res = ast_streamfile(chan, "privacy-thankyou", ast_channel_language(chan)); if (!res) { res = ast_waitstream(chan, ""); } -- cgit v1.2.3