From b4a546d77fc503e432424963d14ae6037082a4bf Mon Sep 17 00:00:00 2001 From: robocop Date: Sat, 15 Jan 2011 09:27:15 +0000 Subject: [PATCH] Misc and small fix. --- src/remote/inet.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/remote/inet.cpp b/src/remote/inet.cpp index c85e70d509..297c28f3ab 100644 --- a/src/remote/inet.cpp +++ b/src/remote/inet.cpp @@ -154,7 +154,7 @@ static void SOCLOSE(SOCKET& socket) #endif socket = INVALID_SOCKET; } -}; +} // Can't find were it's used. //#ifndef SIGURG @@ -1208,7 +1208,7 @@ static rem_port* aux_connect(rem_port* port, PACKET* packet) { int savedError = inetErrNo; SOCLOSE(port->port_channel); - inet_error(false, port, "accept", isc_net_event_connect_err, inetErrNo); + inet_error(false, port, "accept", isc_net_event_connect_err, savedError); } SOCLOSE(port->port_channel); @@ -1979,8 +1979,8 @@ static void select_port(rem_port* main_port, slct_t* selct, RemPortPtr& port) { if (port->port_flags & PORT_disconnect) continue; - else - return; + + return; } const int ok = n < selct->slct_width && FD_ISSET(n, &selct->slct_fdset); #endif @@ -2900,7 +2900,8 @@ static bool packet_receive(rem_port* port, UCHAR* buffer, SSHORT buffer_length, if (slct_count == -1) { - if (!(port->port_flags & PORT_disconnect)) { + if (!(port->port_flags & PORT_disconnect)) + { try { inet_error(false, port, "select in packet_receive", isc_net_read_err, inetErrNo);