[Asterisk-cvs] asterisk say.c,1.38.2.2,1.38.2.3

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv22442

Modified Files:
      Tag: v1-0
	say.c 
Log Message:
OpenBSD fixes (bug #3120)


Index: say.c
===================================================================
RCS file: /usr/cvsroot/asterisk/say.c,v
retrieving revision 1.38.2.2
retrieving revision 1.38.2.3
diff -u -d -r1.38.2.2 -r1.38.2.3
--- say.c	21 Dec 2004 20:42:58 -0000	1.38.2.2
+++ say.c	22 Dec 2004 06:18:32 -0000	1.38.2.3
@@ -682,7 +682,7 @@
 		}
 		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 @@
 		}
 		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 @@
 
 		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 @@
 		}
 		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 @@
 			}
 			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 @@
 
 		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 @@
 	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 @@
 		}
 		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 @@
 			}
 			 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 @@
 			}
 			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 @@
 		}
 		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);