[MPlayer-cvslog] r24579 - trunk/stream/tcp.c

[reimar]

Author: reimar
Date: Wed Sep 19 15:01:08 2007
New Revision: 24579

Log:
(Re)move idiotic checks, ret can't be < 0 or > 0 if the loop condition
is that it is == 0!


Modified:
   trunk/stream/tcp.c

Modified: trunk/stream/tcp.c
==============================================================================
--- trunk/stream/tcp.c	(original)
+++ trunk/stream/tcp.c	Wed Sep 19 15:01:08 2007
@@ -195,9 +195,7 @@ connect2Server_with_af(char *host, int p
 	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 @@ connect2Server_with_af(char *host, int p
 	      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