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

[<ro...@us...>]

Revision: 52650
          http://firebird.svn.sourceforge.net/firebird/?rev=52650&view=rev
Author:   robocop
Date:     2011-04-02 04:53:35 +0000 (Sat, 02 Apr 2011)

Log Message:
-----------
Misc, style, etc.

Modified Paths:
--------------
    firebird/trunk/src/remote/client/interface.cpp
    firebird/trunk/src/remote/os/win32/wnet.cpp
    firebird/trunk/src/remote/os/win32/xnet.cpp
    firebird/trunk/src/remote/remot_proto.h
    firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp

Modified: firebird/trunk/src/remote/client/interface.cpp
===================================================================
--- firebird/trunk/src/remote/client/interface.cpp	2011-04-02 04:51:27 UTC (rev 52649)
+++ firebird/trunk/src/remote/client/interface.cpp	2011-04-02 04:53:35 UTC (rev 52650)
@@ -1513,7 +1513,8 @@
 		RefMutexGuard portGuard(*port->port_sync);
 
 		Rtr* transaction = 0;
-		if (apiTra) {
+		if (apiTra)
+		{
 			transaction = ((Transaction*)apiTra)->getTransaction();
 			CHECK_HANDLE(transaction, isc_bad_trans_handle);
 		}
@@ -1703,7 +1704,8 @@
 		unsigned char* out_msg = outMsgBuffer ? outMsgBuffer->buffer : NULL;
 
 		Rtr* transaction = 0;
-		if (apiTra) {
+		if (apiTra)
+		{
 			transaction = ((Transaction*)apiTra)->getTransaction();
 			CHECK_HANDLE(transaction, isc_bad_trans_handle);
 		}
@@ -2347,7 +2349,8 @@
 		RefMutexGuard portGuard(*port->port_sync);
 
 		Rtr* transaction = 0;
-		if (apiTra) {
+		if (apiTra)
+		{
 			transaction = reinterpret_cast<Transaction*>(apiTra)->getTransaction();
 			CHECK_HANDLE(transaction, isc_bad_trans_handle);
 		}
@@ -3620,7 +3623,7 @@
  *	Abort a transaction but keep its environment valid
  *
  **************************************/
-		reset(status);
+	reset(status);
 
 	CHECK_HANDLE(transaction, isc_bad_trans_handle);
 
@@ -4390,7 +4393,7 @@
 {
 /**************************************
  *
- *	f b _ p i n g
+ *	p i n g
  *
  **************************************
  *

Modified: firebird/trunk/src/remote/os/win32/wnet.cpp
===================================================================
--- firebird/trunk/src/remote/os/win32/wnet.cpp	2011-04-02 04:51:27 UTC (rev 52649)
+++ firebird/trunk/src/remote/os/win32/wnet.cpp	2011-04-02 04:53:35 UTC (rev 52650)
@@ -462,7 +462,7 @@
  *
  * Functional description
  *	A communications link has been established by another
- *	process.  We have inheritted the handle.  Set up
+ *	process.  We have inherited the handle.  Set up
  *	a port block.
  *
  **************************************/

Modified: firebird/trunk/src/remote/os/win32/xnet.cpp
===================================================================
--- firebird/trunk/src/remote/os/win32/xnet.cpp	2011-04-02 04:51:27 UTC (rev 52649)
+++ firebird/trunk/src/remote/os/win32/xnet.cpp	2011-04-02 04:53:35 UTC (rev 52650)
@@ -143,7 +143,7 @@
 	class ExitHandler
 	{
 	public:
-		ExitHandler(MemoryPool&) {};
+		explicit ExitHandler(MemoryPool&) {};
 
 		~ExitHandler()
 		{
@@ -1406,8 +1406,7 @@
 				presponse->slot_num = slot_num;
 				presponse->timestamp = timestamp;
 
-				rem_port* port = get_server_port(client_pid, xpm, map_num, slot_num,
-					timestamp);
+				rem_port* port = get_server_port(client_pid, xpm, map_num, slot_num, timestamp);
 
 				SetEvent(xnet_response_event);
 

Modified: firebird/trunk/src/remote/remot_proto.h
===================================================================
--- firebird/trunk/src/remote/remot_proto.h	2011-04-02 04:51:27 UTC (rev 52649)
+++ firebird/trunk/src/remote/remot_proto.h	2011-04-02 04:53:35 UTC (rev 52650)
@@ -46,5 +46,6 @@
 void		REMOTE_reset_statement (struct Rsr *);
 void		REMOTE_save_status_strings (ISC_STATUS *);
 bool_t		REMOTE_getbytes (XDR*, SCHAR*, u_int);
+
 #endif // REMOTE_REMOT_PROTO_H
 

Modified: firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp
===================================================================
--- firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp	2011-04-02 04:51:27 UTC (rev 52649)
+++ firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp	2011-04-02 04:53:35 UTC (rev 52650)
@@ -540,7 +540,8 @@
  **************************************/
 	ThreadCounter counter;
 
-	if (server_flag & SRVR_inet) {
+	if (server_flag & SRVR_inet)
+	{
 		try {
 			Thread::start(inet_connect_wait_thread, 0, THREAD_medium);
 		}
@@ -548,7 +549,8 @@
 			iscLogException("INET: can't start listener thread", ex);
 		}
 	}
-	if (server_flag & SRVR_wnet) {
+	if (server_flag & SRVR_wnet)
+	{
 		try {
 			Thread::start(wnet_connect_wait_thread, 0, THREAD_medium);
 		}
@@ -556,7 +558,8 @@
 			iscLogException("WNET: can't start listener thread", ex);
 		}
 	}
-	if (server_flag & SRVR_xnet) {
+	if (server_flag & SRVR_xnet)
+	{
 		try {
 			Thread::start(xnet_connect_wait_thread, 0, THREAD_medium);
 		}


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