OpenBSD fixes (bug #3120)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4526 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/say.c b/say.c
index dbed5b2c262a62f1a08b9221016eb1035088051c..480b08e8ed59920c4b5660eb616184ae8a9a515a 100755 (executable)
--- a/say.c
+++ b/say.c
@@ -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);