[Firebird-checkins] CVS: firebird2/src/remote interface.cpp, 1.179, 1.180 protocol.cpp, 1.67, 1.68

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

Build Version :  T2.5.0.19164 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.19324 2008/03/30 11:30:09 robocop Exp )

Update of /cvsroot/firebird/firebird2/src/remote
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9141/src/remote

Modified Files:
	interface.cpp protocol.cpp 
Log Message:
Misc.

Index: interface.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/remote/interface.cpp,v
retrieving revision 1.179
retrieving revision 1.180
diff -b -U3 -r1.179 -r1.180
--- interface.cpp	30 Mar 2008 09:49:22 -0000	1.179
+++ interface.cpp	30 Mar 2008 11:30:00 -0000	1.180
@@ -6369,8 +6369,7 @@
 
 	delete (*statement)->rsr_bind_format;
 	if ((*statement)->rsr_user_select_format &&
-		(*statement)->rsr_user_select_format !=
-		(*statement)->rsr_select_format)
+		(*statement)->rsr_user_select_format != (*statement)->rsr_select_format)
 	{
 		delete (*statement)->rsr_user_select_format;
 	}

Index: protocol.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/remote/protocol.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -b -U3 -r1.67 -r1.68
--- protocol.cpp	30 Mar 2008 09:38:24 -0000	1.67
+++ protocol.cpp	30 Mar 2008 11:30:00 -0000	1.68
@@ -1568,8 +1568,7 @@
 		return TRUE;
 
     REM_MSG message = statement->rsr_buffer;
-	if (!(message != 0) ||
-		statement->rsr_format->fmt_length > statement->rsr_fmt_length)
+	if (message == NULL || statement->rsr_format->fmt_length > statement->rsr_fmt_length)
 	{
 		REMOTE_release_messages(message);
 		statement->rsr_fmt_length = statement->rsr_format->fmt_length;