Mercurial > mplayer.hg

changeset 24559:7b6a3948f5f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Re)move idiotic checks, ret can't be < 0 or > 0 if the loop condition is that it is == 0!
author reimar
date Wed, 19 Sep 2007 13:01:08 +0000
parents 97eaba07ef9d
children 682430d8bcc5
files stream/tcp.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/stream/tcp.c	Wed Sep 19 12:54:10 2007 +0000
+++ b/stream/tcp.c	Wed Sep 19 13:01:08 2007 +0000
@@ -195,9 +195,7 @@
 	FD_SET( socket_server_fd, &set );
 	// When the connection will be made, we will have a writeable fd
 	while((ret = select(socket_server_fd+1, NULL, &set, NULL, &tv)) == 0) {
-	      if( ret<0 ) mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_SelectFailed);
-	      else if(ret > 0) break;
-	      else if(count > 30 || mp_input_check_interrupt(500)) {
+	      if(count > 30 || mp_input_check_interrupt(500)) {
 		if(count > 30)
 		  mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_ConnTimeout);
 		else
@@ -210,6 +208,7 @@
 	      tv.tv_sec = 0;
 	      tv.tv_usec = 500000;
 	}
+	if (ret < 0) mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_SelectFailed);
 
 	// Turn back the socket as blocking
 #ifndef HAVE_WINSOCK2