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

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

Revision: 53778
          http://firebird.svn.sourceforge.net/firebird/?rev=53778&view=rev
Author:   asfernandes
Date:     2011-12-28 01:07:49 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Misc.

Modified Paths:
--------------
    firebird/trunk/src/remote/client/interface.cpp
    firebird/trunk/src/remote/protocol.cpp
    firebird/trunk/src/remote/remote.h
    firebird/trunk/src/remote/server/server.cpp

Modified: firebird/trunk/src/remote/client/interface.cpp
===================================================================
--- firebird/trunk/src/remote/client/interface.cpp	2011-12-27 12:45:55 UTC (rev 53777)
+++ firebird/trunk/src/remote/client/interface.cpp	2011-12-28 01:07:49 UTC (rev 53778)
@@ -7075,7 +7075,7 @@
 
 	PathName pluginName = getPluginName();
 	to->p_name.cstr_length = pluginName.length();
-	to->p_name.cstr_address = (UCHAR*)(pluginName.c_str());
+	to->p_name.cstr_address = (UCHAR*) pluginName.c_str();
 	to->p_name.cstr_allocated = 0;
 
 	HANDSHAKE_DEBUG(fprintf(stderr, "extractDataFromPluginTo added plugin name (%d) and data (%d)\n",
@@ -7084,7 +7084,7 @@
 	if (firstTime)
 	{
 		to->p_list.cstr_length = pluginList.length();
-		to->p_list.cstr_address = (UCHAR*)(pluginList.c_str());
+		to->p_list.cstr_address = (UCHAR*) pluginList.c_str();
 		to->p_list.cstr_allocated = 0;
 		HANDSHAKE_DEBUG(fprintf(stderr, "extractDataFromPluginTo added plugin list (%d len) to packet\n",
 								to->p_list.cstr_length));
@@ -7109,7 +7109,7 @@
 const unsigned char* ClntAuthBlock::getData(unsigned int* length)
 {
 	*length = dataForPlugin.getCount();
-	return (*length) ? dataForPlugin.begin() : NULL;
+	return *length ? dataForPlugin.begin() : NULL;
 }
 
 void ClntAuthBlock::putData(unsigned int length, const void* data)

Modified: firebird/trunk/src/remote/protocol.cpp
===================================================================
--- firebird/trunk/src/remote/protocol.cpp	2011-12-27 12:45:55 UTC (rev 53777)
+++ firebird/trunk/src/remote/protocol.cpp	2011-12-28 01:07:49 UTC (rev 53778)
@@ -338,7 +338,7 @@
 		MAP(xdr_cstring, accept_with_data->p_acpt_data);
 		MAP(xdr_cstring, accept_with_data->p_acpt_plugin);
 		MAP(xdr_u_short, accept_with_data->p_acpt_authenticated);
-//???		fprintf(stderr, "data length %d\n", accept_with_data->p_acpt_data.cstr_length);
+		//???	fprintf(stderr, "data length %d\n", accept_with_data->p_acpt_data.cstr_length);
 		DEBUG_PRINTSIZE(xdrs, p->p_operation);
 		return P_TRUE(xdrs, p);
 

Modified: firebird/trunk/src/remote/remote.h
===================================================================
--- firebird/trunk/src/remote/remote.h	2011-12-27 12:45:55 UTC (rev 53777)
+++ firebird/trunk/src/remote/remote.h	2011-12-28 01:07:49 UTC (rev 53778)
@@ -600,7 +600,7 @@
 typedef Firebird::GetPlugins<Auth::IClient> AuthClientPlugins;
 
 // Representation of authentication data, visible for plugin
-// Transfered in format, depending upon type of the packet (phaze of handshake)
+// Transfered in format, depending upon type of the packet (phase of handshake)
 class ClntAuthBlock : public Firebird::StdPlugin<Auth::IClientBlock, FB_AUTH_CLIENT_BLOCK_VERSION>
 {
 private:
@@ -631,7 +631,7 @@
 	void loadServiceDataFrom(rem_port*);
 	Firebird::PathName getPluginName();
 
-//	Auth::IClientBlock implementation
+	// Auth::IClientBlock implementation
 	int FB_CARG release();
 	const char* FB_CARG getLogin();
 	const char* FB_CARG getPassword();
@@ -690,7 +690,7 @@
 	void setDataForPlugin(const p_auth_continue* data);
 	void reset();
 
-//	Auth::IServerBlock implementation
+	// Auth::IServerBlock implementation
 	int FB_CARG release();
 	const char* FB_CARG getLogin();
 	const unsigned char* FB_CARG getData(unsigned int* length);

Modified: firebird/trunk/src/remote/server/server.cpp
===================================================================
--- firebird/trunk/src/remote/server/server.cpp	2011-12-27 12:45:55 UTC (rev 53777)
+++ firebird/trunk/src/remote/server/server.cpp	2011-12-28 01:07:49 UTC (rev 53778)
@@ -257,7 +257,7 @@
 		if (aDbName)
 		{
 			dbName = *aDbName;
-			if (oldPath && (dbName != oldPath))
+			if (oldPath && dbName != oldPath)
 			{
 				HANDSHAKE_DEBUG(fprintf(stderr, "old='%s' new='%s'\n", oldPath, dbName.c_str()));
 				(Arg::Gds(isc_login) << Arg::Gds(isc_random) << "Client error - database name does not match").raise();
@@ -1389,9 +1389,9 @@
 				for (; plugins->hasData(); plugins->next())
 				{
 					port->port_srv_auth_block->authBlockWriter.setMethod(plugins->name());
-					switch (port->port_srv_auth_block->plugins->plugin()->
-							authenticate(&status, port->port_srv_auth_block,
-										 &port->port_srv_auth_block->authBlockWriter))
+					switch (port->port_srv_auth_block->plugins->plugin()->authenticate(
+								&status, port->port_srv_auth_block,
+								&port->port_srv_auth_block->authBlockWriter))
 					{
 					case Auth::AUTH_SUCCESS:
 						port->port_srv_auth_block->authCompleted(true);
@@ -6040,7 +6040,7 @@
 const unsigned char* SrvAuthBlock::getData(unsigned int* length)
 {
 	*length = dataForPlugin.getCount();
-	return (*length) ? dataForPlugin.begin() : NULL;
+	return *length ? dataForPlugin.begin() : NULL;
 }
 
 void SrvAuthBlock::putData(unsigned int length, const void* data)

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