diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-22 06:18:32 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-22 06:18:32 +0000 |
commit | f9b7b3162e5c238ff74a600eadf139e8b890da7f (patch) | |
tree | f19c76e16de09119e5a979f5e1605ab954965105 /say.c | |
parent | d83e5b78c5bcd788b26c16f6bd10b6e3ece7d65d (diff) |
OpenBSD fixes (bug #3120)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/v1-0@4526 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'say.c')
-rwxr-xr-x | say.c | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -682,7 +682,7 @@ static int ast_say_number_full_da(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -791,14 +791,14 @@ static int ast_say_number_full_de(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); } ast_stopstream(chan); if(!ast_streamfile(chan, fna, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -881,7 +881,7 @@ static int ast_say_number_full_es(struct ast_channel *chan, int num, char *ints, if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -967,7 +967,7 @@ static int ast_say_number_full_fr(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -1113,7 +1113,7 @@ static int ast_say_number_full_it(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -1183,7 +1183,7 @@ static int ast_say_number_full_nl(struct ast_channel *chan, int num, char *ints, if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -1238,7 +1238,7 @@ static void pl_odtworz_plik(struct ast_channel *chan, char *language, int audiof strcat(file_name, fn); ast_log(LOG_DEBUG, "Trying to play: %s\n", file_name); if (!ast_streamfile(chan, file_name, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) ast_waitstream_full(chan, ints, audiofd, ctrlfd); else ast_waitstream(chan, ints); @@ -1568,7 +1568,7 @@ static int ast_say_number_full_pt(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); } @@ -1638,7 +1638,7 @@ static int ast_say_number_full_se(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -1699,7 +1699,7 @@ static int ast_say_number_full_tw(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) + if ((audiofd > -1) && (ctrlfd > -1)) res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); else res = ast_waitstream(chan, ints); @@ -1808,7 +1808,7 @@ static int ast_say_number_full_cz(struct ast_channel *chan, int num, char *ints, } if (!res) { if(!ast_streamfile(chan, fn, language)) { - if (audiofd && ctrlfd) { + if ((audiofd > -1) && (ctrlfd > -1)) { res = ast_waitstream_full(chan, ints, audiofd, ctrlfd); } else { res = ast_waitstream(chan, ints); |