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 /main/file.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 'main/file.c')
| -rw-r--r-- | main/file.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/main/file.c b/main/file.c index c6262bf89..cd6afb9bd 100644 --- a/main/file.c +++ b/main/file.c @@ -1118,12 +1118,11 @@ int ast_waitstream_exten(struct ast_channel *c, const char *context) * Return 0 if success, -1 if error, digit if interrupted by a digit. * If digits == "" then we can simply check for non-zero. */ -int ast_stream_and_wait(struct ast_channel *chan, const char *file, - const char *language, const char *digits) +int ast_stream_and_wait(struct ast_channel *chan, const char *file, const char *digits) { int res = 0; if (!ast_strlen_zero(file)) { - res = ast_streamfile(chan, file, language); + res = ast_streamfile(chan, file, chan->language); if (!res) res = ast_waitstream(chan, digits); } |