From 946272e8b4da1399ac5cda699153201161124de2 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 19 Sep 2007 13:01:08 +0000 Subject: (Re)move idiotic checks, ret can't be < 0 or > 0 if the loop condition is that it is == 0! git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24579 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tcp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'stream') diff --git a/stream/tcp.c b/stream/tcp.c index bf5f06c820..def97a4564 100644 --- a/stream/tcp.c +++ b/stream/tcp.c @@ -195,9 +195,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) { 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 port, int af,int verb) { 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 -- cgit v1.2.3