[Firebird-checkins] CVS: firebird2/src/remote/os/win32 wnet.cpp,1.29,1.30

[Claudio V. C. <ro...@us...>]

Build Version :  T2.0.0.9983 Firebird 2.0 UNSTABLE

(writeBuildNum.sh,v 1.9987 2004/12/28 05:21:04 robocop Exp  )

Update of /cvsroot/firebird/firebird2/src/remote/os/win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26473/src/remote/os/win32

Modified Files:
	wnet.cpp 
Log Message:
Misc.

Index: wnet.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/remote/os/win32/wnet.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -b -U3 -r1.29 -r1.30
--- wnet.cpp	26 Dec 2004 13:48:01 -0000	1.29
+++ wnet.cpp	28 Dec 2004 05:21:00 -0000	1.30
@@ -297,10 +297,10 @@
 /* once we've decided on a protocol, concatenate the version 
    string to reflect it...  */
 
-	sprintf(buffer, "%s/P%d", port->port_version->str_data,
-			port->port_protocol);
+	Firebird::string temp;
+	temp.printf("%s/P%d", port->port_version->str_data, port->port_protocol);
 	ALLR_free(port->port_version);
-	port->port_version = REMOTE_make_string(buffer);
+	port->port_version = REMOTE_make_string(temp.c_str());
 
 	if (packet->p_acpt.p_acpt_architecture == ARCHITECTURE)
 		port->port_flags |= PORT_symmetric;
@@ -372,8 +372,7 @@
 #ifndef REQUESTER
 /* We're a server, so wait for a host to show up */
 
-	LPSECURITY_ATTRIBUTES security_attr;
-	security_attr = ISC_get_security_desc();
+	LPSECURITY_ATTRIBUTES security_attr = ISC_get_security_desc();
 	THREAD_EXIT();
 	TEXT command_line[MAXPATHLEN + 32];
 	command_line[0] = 0;
@@ -440,13 +439,13 @@
 
 			if (manager && service)
 			{
-				LPQUERY_SERVICE_CONFIG config;
 				SCHAR buffer[1024];
 				DWORD config_len;
 
-				config = (LPQUERY_SERVICE_CONFIG) buffer;
+				LPQUERY_SERVICE_CONFIG config = (LPQUERY_SERVICE_CONFIG) buffer;
 				if (!QueryServiceConfig
-					(service, config, sizeof(buffer), &config_len)) {
+					(service, config, sizeof(buffer), &config_len))
+				{
 					THREAD_ENTER();
 					config = (LPQUERY_SERVICE_CONFIG) ALLR_alloc(config_len);
 					/* NOMEM: handled by ALLR_alloc, FREE: in this block */