[Firebird-checkins] CVS: firebird2/src/remote xnet.cpp, 1.149, 1.150 xnet_proto.h, 1.18, 1.19

[Dmitry Y. <di...@us...>]

Build Version :  T3.0.0.28019 Firebird 3.0 Unstable

(writeBuildNum.sh,v 1.28194 2010/03/21 13:00:16 dimitr Exp  )

Update of /cvsroot/firebird/firebird2/src/remote
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv15354

Modified Files:
	xnet.cpp xnet_proto.h 
Log Message:
Cleanup.

Index: xnet.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/remote/xnet.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -b -U3 -r1.149 -r1.150
--- xnet.cpp	4 Feb 2010 15:36:02 -0000	1.149
+++ xnet.cpp	21 Mar 2010 13:00:12 -0000	1.150
@@ -197,8 +197,6 @@
 
 rem_port* XNET_analyze(const Firebird::PathName& file_name,
 					   ISC_STATUS* status_vector,
-					   //const TEXT* node_name,
-					   //const TEXT* user_string,
 					   bool uv_flag)
 {
 /**************************************
@@ -268,7 +266,7 @@
 
 	// If we can't talk to a server, punt. Let somebody else generate an error.
 
-	rem_port* port = XNET_connect(/*node_name,*/ packet, status_vector, 0);
+	rem_port* port = XNET_connect(packet, status_vector, 0);
 	if (!port)
 	{
 		delete rdb;
@@ -307,7 +305,7 @@
 			cnct->p_cnct_versions[i] = protocols_to_try2[i];
 		}
 
-		if (!(port = XNET_connect(/*node_name,*/ packet, status_vector, 0)))
+		if (!(port = XNET_connect(packet, status_vector, 0)))
 		{
 			delete rdb;
 			return NULL;
@@ -345,7 +343,7 @@
 			cnct->p_cnct_versions[i] = protocols_to_try3[i];
 		}
 
-		if (!(port = XNET_connect(/*node_name,*/ packet, status_vector, 0)))
+		if (!(port = XNET_connect(packet, status_vector, 0)))
 		{
 			delete rdb;
 			return NULL;
@@ -393,8 +391,7 @@
 }
 
 
-rem_port* XNET_connect(//const TEXT* name,
-					   PACKET* packet,
+rem_port* XNET_connect(PACKET* packet,
 					   ISC_STATUS* status_vector,
 					   USHORT flag)
 {

Index: xnet_proto.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/remote/xnet_proto.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -U3 -r1.18 -r1.19
--- xnet_proto.h	28 Apr 2009 13:08:00 -0000	1.18
+++ xnet_proto.h	21 Mar 2010 13:00:12 -0000	1.19
@@ -32,8 +32,8 @@
 #define rem_port void
 #endif
 
-rem_port* XNET_analyze(const Firebird::PathName&, ISC_STATUS*, /*const TEXT*, const TEXT*,*/ bool);
-rem_port* XNET_connect(/*const TEXT*,*/ struct packet*, ISC_STATUS*, USHORT);
+rem_port* XNET_analyze(const Firebird::PathName&, ISC_STATUS*, bool);
+rem_port* XNET_connect(struct packet*, ISC_STATUS*, USHORT);
 
 #ifndef SUPERCLIENT
 rem_port* XNET_reconnect(ULONG, ISC_STATUS*);