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

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

Revision: 53923
          http://firebird.svn.sourceforge.net/firebird/?rev=53923&view=rev
Author:   dimitr
Date:     2012-01-25 07:32:35 +0000 (Wed, 25 Jan 2012)
Log Message:
-----------
Simplification.

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

Modified: firebird/trunk/src/remote/client/interface.cpp
===================================================================
--- firebird/trunk/src/remote/client/interface.cpp	2012-01-25 07:13:53 UTC (rev 53922)
+++ firebird/trunk/src/remote/client/interface.cpp	2012-01-25 07:32:35 UTC (rev 53923)
@@ -5777,7 +5777,7 @@
  *
  **************************************/
 
-	if (!from_fmt || !to_fmt || from_fmt->fmt_count != to_fmt->fmt_count)
+	if (!from_fmt || !to_fmt || from_fmt->fmt_desc.getCount() != to_fmt->fmt_desc.getCount())
 	{
 		move_error(Arg::Gds(isc_dsql_sqlda_err));
 		// Msg 263 SQLDA missing or wrong number of variables
@@ -5785,8 +5785,8 @@
 
 	const dsc* from_desc = from_fmt->fmt_desc.begin();
 	const dsc* to_desc = to_fmt->fmt_desc.begin();
-	const dsc* const end_desc = to_desc + to_fmt->fmt_count;
-	for (; to_desc < end_desc; from_desc++, to_desc++)
+	for (const dsc* const end_desc = to_fmt->fmt_desc.end();
+		to_desc < end_desc; from_desc++, to_desc++)
 	{
 		dsc from = *from_desc;
 		dsc to = *to_desc;

Modified: firebird/trunk/src/remote/parser.cpp
===================================================================
--- firebird/trunk/src/remote/parser.cpp	2012-01-25 07:13:53 UTC (rev 53922)
+++ firebird/trunk/src/remote/parser.cpp	2012-01-25 07:32:35 UTC (rev 53923)
@@ -81,7 +81,6 @@
 #ifdef DEBUG_REMOTE_MEMORY
 		printf("PARSE_messages            allocate format  %x\n", format);
 #endif
-		format->fmt_count = count;
 		USHORT offset = 0;
 		for (dsc* desc = format->fmt_desc.begin(); count; --count, ++desc)
 		{

Modified: firebird/trunk/src/remote/protocol.cpp
===================================================================
--- firebird/trunk/src/remote/protocol.cpp	2012-01-25 07:13:53 UTC (rev 53922)
+++ firebird/trunk/src/remote/protocol.cpp	2012-01-25 07:32:35 UTC (rev 53923)
@@ -1149,7 +1149,7 @@
 	}
 
 	const dsc* desc = format->fmt_desc.begin();
-	for (const dsc* const end = desc + format->fmt_count; desc < end; ++desc)
+	for (const dsc* const end = format->fmt_desc.end(); desc < end; ++desc)
 	{
 		if (!xdr_datum(xdrs, desc, message->msg_address))
 			return FALSE;

Modified: firebird/trunk/src/remote/remote.h
===================================================================
--- firebird/trunk/src/remote/remote.h	2012-01-25 07:13:53 UTC (rev 53922)
+++ firebird/trunk/src/remote/remote.h	2012-01-25 07:32:35 UTC (rev 53923)
@@ -289,14 +289,12 @@
 {
 	USHORT		fmt_length;
 	USHORT		fmt_net_length;
-	USHORT		fmt_count;
-	USHORT		fmt_version;
 	Firebird::Array<dsc> fmt_desc;
 
 public:
 	explicit rem_fmt(size_t rpt) :
-		fmt_length(0), fmt_net_length(0), fmt_count(0),
-		fmt_version(0), fmt_desc(getPool(), rpt)
+		fmt_length(0), fmt_net_length(0),
+		fmt_desc(getPool(), rpt)
 	{
 		fmt_desc.grow(rpt);
 	}

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