kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 45051 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45051 | file | 2006-10-13 12:20:58 -0400 (Fri, 13 Oct 2006) | 2 lines

Move say.conf existence check to do_say function since it is called from multiple places (issue #8144 reported by kshumard)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-10-13 16:22:17 +00:00
parent 2194e57499
commit 1bc1f0f267
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_playback.c
View File

@@ -156,6 +156,9 @@ static int do_say(say_args_t *a, const char *s, const char *options, int depth)
if (depth++ > 10) { if (depth++ > 10) {
ast_log(LOG_WARNING, "recursion too deep, exiting\n"); ast_log(LOG_WARNING, "recursion too deep, exiting\n");
return -1; return -1;
} else if (!say_cfg) {
ast_log(LOG_WARNING, "no say.conf, cannot spell '%s'\n", s);
return -1;
} }
/* scan languages same as in file.c */ /* scan languages same as in file.c */
@@ -253,11 +256,6 @@ static int say_full(struct ast_channel *chan, const char *string,
int audiofd, int ctrlfd) int audiofd, int ctrlfd)
{ {
say_args_t a = { chan, ints, lang, audiofd, ctrlfd }; say_args_t a = { chan, ints, lang, audiofd, ctrlfd };
if (!say_cfg) {
ast_log(LOG_WARNING, "no say.conf, cannot spell '%s'\n", string);
return -1;
}
return do_say(&a, string, options, 0); return do_say(&a, string, options, 0);
} }