[Firebird-checkins] SF.net SVN: firebird:[62379] firebird/trunk/src/remote

[<asf...@us...>]

Revision: 62379
          http://sourceforge.net/p/firebird/code/62379
Author:   asfernandes
Date:     2015-10-18 01:30:28 +0000 (Sun, 18 Oct 2015)
Log Message:
-----------
Misc.

Modified Paths:
--------------
    firebird/trunk/src/remote/inet.cpp
    firebird/trunk/src/remote/server/server.cpp

Modified: firebird/trunk/src/remote/inet.cpp
===================================================================
--- firebird/trunk/src/remote/inet.cpp	2015-10-17 00:09:28 UTC (rev 62378)
+++ firebird/trunk/src/remote/inet.cpp	2015-10-18 01:30:28 UTC (rev 62379)
@@ -1566,7 +1566,7 @@
 	// is an attempt to return the socket to a state where a graceful shutdown can
 	// occur.
 
-	// hvlad: for graceful shutdown linger should be turned on (despite of default 
+	// hvlad: for graceful shutdown linger should be turned on (despite of default
 	// setting by OS)
 	{ // scope
 		struct linger lngr = {1, 10};
@@ -1575,7 +1575,7 @@
 		if (port->port_linger.l_onoff)
 			lngr = port->port_linger;
 
-		setsockopt(port->port_handle, SOL_SOCKET, SO_LINGER, (SCHAR*)&lngr, sizeof(lngr));
+		setsockopt(port->port_handle, SOL_SOCKET, SO_LINGER, (SCHAR*) &lngr, sizeof(lngr));
 	}
 
 	if (port->port_handle != INVALID_SOCKET)
@@ -1586,6 +1586,7 @@
 		FD_SET(port->port_handle, &fd);
 		timeval tm = {10, 0};
 		int n = select(1, &fd, NULL, NULL, &tm);
+
 		while (n > 0)
 		{
 			char buff[256];

Modified: firebird/trunk/src/remote/server/server.cpp
===================================================================
--- firebird/trunk/src/remote/server/server.cpp	2015-10-17 00:09:28 UTC (rev 62378)
+++ firebird/trunk/src/remote/server/server.cpp	2015-10-18 01:30:28 UTC (rev 62379)
@@ -720,8 +720,8 @@
 			return;
 
 		RefMutexGuard portGuard(*port->port_sync, FB_FUNCTION);
-		
-		// hvlad: it is important to call IEvents::cancel() under protection 
+
+		// hvlad: it is important to call IEvents::cancel() under protection
 		// of async port mutex to avoid crash in rem_port::que_events
 
 		if (allowCancel && event->rvnt_iface)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.