diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-17 23:18:51 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-17 23:18:51 +0000 |
| commit | 9ed9bbabf4b8ff0294c44090db38596e4372f7ab (patch) | |
| tree | a3f2ce4fd65d5aa1475c1c2759546c3e95ee294f /apps/app_directory.c | |
| parent | 9c024540238f1c193d392978b6d7517a75c54e6a (diff) | |
This update fulfils the request of bug 7109, which claimed the language arg to ast_stream_and_wait() was redundant. Almost all calls just used chan->language, and seeing how chan is the first argument, this certainly seems redundant. A change of language could just as easily be done by simply changing the channel language before calling.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47821 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_directory.c')
| -rw-r--r-- | apps/app_directory.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/app_directory.c b/apps/app_directory.c index 14d5dd61a..3b1d29e11 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -282,17 +282,17 @@ static int play_mailbox_owner(struct ast_channel *chan, char *context, #endif if (ast_fileexists(fn, NULL, chan->language) > 0) { - res = ast_stream_and_wait(chan, fn, chan->language, AST_DIGIT_ANY); + res = ast_stream_and_wait(chan, fn, AST_DIGIT_ANY); ast_stopstream(chan); /* If Option 'e' was specified, also read the extension number with the name */ if (readext) { - ast_stream_and_wait(chan, "vm-extension", chan->language, AST_DIGIT_ANY); + ast_stream_and_wait(chan, "vm-extension", AST_DIGIT_ANY); res = ast_say_character_str(chan, ext, AST_DIGIT_ANY, chan->language); } } else { res = ast_say_character_str(chan, S_OR(name, ext), AST_DIGIT_ANY, chan->language); if (!ast_strlen_zero(name) && readext) { - ast_stream_and_wait(chan, "vm-extension", chan->language, AST_DIGIT_ANY); + ast_stream_and_wait(chan, "vm-extension", AST_DIGIT_ANY); res = ast_say_character_str(chan, ext, AST_DIGIT_ANY, chan->language); } } @@ -303,7 +303,7 @@ static int play_mailbox_owner(struct ast_channel *chan, char *context, for (loop = 3 ; loop > 0; loop--) { if (!res) - res = ast_stream_and_wait(chan, "dir-instr", chan->language, AST_DIGIT_ANY); + res = ast_stream_and_wait(chan, "dir-instr", AST_DIGIT_ANY); if (!res) res = ast_waitfordigit(chan, 3000); ast_stopstream(chan); @@ -622,7 +622,7 @@ static int directory_exec(struct ast_channel *chan, void *data) for (;;) { if (!res) - res = ast_stream_and_wait(chan, dirintro, chan->language, AST_DIGIT_ANY); + res = ast_stream_and_wait(chan, dirintro, AST_DIGIT_ANY); ast_stopstream(chan); if (!res) res = ast_waitfordigit(chan, 5000); |