firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 02:03:04 +01:00
Code Issues

Misc and small fix.

Browse Source
This commit is contained in:
robocop 2011-01-15 09:27:15 +00:00
parent 469c770b2f
commit b4a546d77f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/remote/inet.cpp
View File

@ -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);