Firebird

Build Version :  T2.0.0.4247 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4246 2003/08/13 22:09:29 fsg Exp $ )

Update of /cvsroot/firebird/firebird2
In directory sc8-pr-cvs1:/tmp/cvs-serv25188/firebird2

Modified Files:
	ChangeLog 
Log Message:
nightly update


Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/firebird2/ChangeLog,v
retrieving revision 1.286
retrieving revision 1.287
diff -b -U3 -r1.286 -r1.287
--- ChangeLog	12 Aug 2003 22:03:58 -0000	1.286
+++ ChangeLog	13 Aug 2003 22:09:28 -0000	1.287
@@ -1,3 +1,72 @@
+2003-08-13 13:45  robocop
+
+	* firebird2/src/jrd/fun.epp:
+	
+	Fix SF Bugs #544132 and #728839.  Added some ugly code, too.  More
+	correct null signaling may cause surprise to UDF devs used to some
+	bugs.
+
+2003-08-13 13:26  alexpeshkoff
+
+	* firebird2/builds/win32/msvc6/gfix.dsp:
+	
+	Also fix MSVC6 gfix build in head branch
+
+2003-08-13 13:13  alexpeshkoff
+
+	* firebird2/builds/win32/msvc6/gfix.dsp:
+	
+	Fixed MSVC6 gfix build
+
+2003-08-13 13:11  robocop
+
+	* firebird2/builds/win32/msvc6/fbserver.dsp:
+	
+	Committed... just in case
+
+2003-08-13 13:11  robocop
+
+	* firebird2/src/jrd/cch.cpp:
+	
+	Kill two warnings in Win32
+
+2003-08-13 13:09  robocop
+
+	* firebird2/src/dsql/gen.cpp:
+	
+	There are less unnamed fields now.  Changed the code style, too.
+
+2003-08-13 13:08  robocop
+
+	* firebird2/src/dsql/utld.cpp:
+	
+	Little C->C++ style change
+
+2003-08-13 13:07  robocop
+
+	* firebird2/src/burp/backup.epp:
+	
+	Since stringstream is no longer used, remove the header.
+
+2003-08-13 13:06  robocop
+
+	* firebird2/examples/api/apifull.c:
+	
+	Let's hope the cure is not worse than the sickness Took VARY from
+	ibase.h
+
+2003-08-13 13:01  skidder
+
+	* firebird2/src/common/classes/vector.h:
+	
+	Change header comment
+
+2003-08-13 12:45  aafemt
+
+	* firebird2/src/jrd/: btr.cpp, nav.cpp, val.cpp:
+	
+	replacing BTR_get_quad() by get_long
+
 2003-08-12 21:54  skidder
 
 	* firebird2/: builds/misc/msg.gbak, lang_helpers/gds_codes.ftn,

Update of /cvsroot/firebird/OdbcJdbc
In directory sc8-pr-cvs1:/tmp/cvs-serv21386

Modified Files:
      Tag: v1-1-beta
	OdbcConnection.cpp OdbcConnection.h OdbcError.h OdbcJdbc.def 
	OdbcObject.h OdbcStatement.cpp 
Log Message:
change source OdbcJdbc, for execute make from MinGW, Bcc55 and other compiles
 branch v1-1-beta

Index: OdbcConnection.cpp
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/OdbcConnection.cpp,v
retrieving revision 1.13.2.4
retrieving revision 1.13.2.5
diff -b -U3 -r1.13.2.4 -r1.13.2.5
--- OdbcConnection.cpp	26 Jul 2003 13:07:45 -0000	1.13.2.4
+++ OdbcConnection.cpp	13 Aug 2003 12:58:16 -0000	1.13.2.5
@@ -1368,7 +1368,11 @@
 			text.Format ("Unable to connect to data source: library '%s' failed to load", sharedLibrary);
 			return sqlReturn (SQL_ERROR, "08001", text);
 		}
+#ifdef __BORLANDC__
+		ConnectFn fn = (ConnectFn) GetProcAddress (handle, "_createConnection");
+#else
 		ConnectFn fn = (ConnectFn) GetProcAddress (handle, "createConnection");
+#endif
 		if (!fn)
 		{
 			JString text;
@@ -1475,6 +1479,8 @@
 {
 	if (!dsn.IsEmpty())
 	{
+		const char * optionsTpb;
+
 		if (databaseName.IsEmpty())
 			databaseName = readAttribute (SETUP_DBNAME);
 
@@ -1491,11 +1497,15 @@
 			role = readAttribute(SETUP_ROLE);
 
 		optTpb = 0;
+		optionsTpb = (const char *)readAttribute(SETUP_READONLY_TPB);
+
+		if(optionsTpb && *optionsTpb == 'Y')
+			optTpb |=TRA_ro;
+
+		optionsTpb = (const char *)readAttribute(SETUP_NOWAIT_TPB);
 
-		JString	optionsTpb = readAttribute(SETUP_READONLY_TPB);
-		if(optionsTpb[0]=='Y')optTpb |=TRA_ro;
-		optionsTpb = readAttribute(SETUP_NOWAIT_TPB);
-		if(optionsTpb[0]=='Y')optTpb |=TRA_nw;
+		if(optionsTpb && *optionsTpb == 'Y')
+			optTpb |=TRA_nw;
 	}
 
 	if (jdbcDriver.IsEmpty())

Index: OdbcConnection.h
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/OdbcConnection.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -b -U3 -r1.4.2.1 -r1.4.2.2
--- OdbcConnection.h	26 May 2003 08:31:28 -0000	1.4.2.1
+++ OdbcConnection.h	13 Aug 2003 12:58:16 -0000	1.4.2.2
@@ -30,7 +30,7 @@
 #endif // _MSC_VER >= 1000
 
 #include "OdbcDesc.h"
-#include "JString.h"	// Added by ClassView
+#include "IscDbc/JString.h"	// Added by ClassView
 
 class OdbcEnv;
 class Connection;

Index: OdbcError.h
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/OdbcError.h,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -b -U3 -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- OdbcError.h	12 Jul 2003 17:56:32 -0000	1.1.1.1.2.1
+++ OdbcError.h	13 Aug 2003 12:58:16 -0000	1.1.1.1.2.2
@@ -29,7 +29,7 @@
 #pragma once
 #endif // _MSC_VER >= 1000
 
-#include "JString.h"
+#include "IscDbc/JString.h"
 
 class OdbcError  
 {

Index: OdbcJdbc.def
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/OdbcJdbc.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -b -U3 -r1.1 -r1.1.2.1
--- OdbcJdbc.def	3 Jul 2001 22:42:15 -0000	1.1
+++ OdbcJdbc.def	13 Aug 2003 12:58:16 -0000	1.1.2.1
@@ -1,7 +1,6 @@
 LIBRARY OdbcJdbc
 DESCRIPTION "OdbcJdbc -- Jim's ODBC/JDBC Driver"
 EXETYPE WINDOWS
-VERSION 1.0.0.0
 
 EXPORTS
 HEAPSIZE 10240,4096

Index: OdbcObject.h
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/OdbcObject.h,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -b -U3 -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- OdbcObject.h	12 Jul 2003 17:56:32 -0000	1.1.1.1.2.1
+++ OdbcObject.h	13 Aug 2003 12:58:16 -0000	1.1.1.1.2.2
@@ -30,7 +30,7 @@
 #endif // _MSC_VER >= 1000
 
 #include "OdbcJdbc.h"
-#include "JString.h"
+#include "IscDbc/JString.h"
 
 enum OdbcObjectType {
     odbcTypeEnv,

Index: OdbcStatement.cpp
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/OdbcStatement.cpp,v
retrieving revision 1.20.2.13
retrieving revision 1.20.2.14
diff -b -U3 -r1.20.2.13 -r1.20.2.14
--- OdbcStatement.cpp	7 Aug 2003 12:47:47 -0000	1.20.2.13
+++ OdbcStatement.cpp	13 Aug 2003 12:58:16 -0000	1.20.2.14
@@ -2435,15 +2435,12 @@
 			{
 			case 11999:
 				return statement->getStmtPlan(ptr,bufferLength,lengthPtr);
-				break;
 
 			case 11998:
 				return statement->getStmtType(ptr,bufferLength,lengthPtr);
-				break;
 
 			case 11997:
 				return statement->getStmtInfoCountRecords(ptr,bufferLength,lengthPtr);
-				break;
 
 			case SQL_ATTR_APP_ROW_DESC:
 				value = (long) applicationRowDescriptor;
@@ -2779,7 +2776,6 @@
 						statement->beginBlobDataTransfer(n+1);
 					}
 					return SQL_NEED_DATA;
-				break;				
 			}
 		}
 		else

Update of /cvsroot/firebird/OdbcJdbc/Builds
In directory sc8-pr-cvs1:/tmp/cvs-serv17426

Added Files:
      Tag: v1-1-beta
	makefile.environ makefile.sources 
Log Message:
add common makefiles

--- makefile.environ ADDED ---

--- makefile.sources ADDED ---

Update of /cvsroot/firebird/OdbcJdbc/IscDbc
In directory sc8-pr-cvs1:/tmp/cvs-serv21632

Modified Files:
      Tag: v1-1-beta
	Connection.h DateTime.cpp DateTime.h extodbc.cpp IscArray.cpp 
	IscConnection.cpp IscStatement.cpp SqlTime.cpp SqlTime.h 
	TimeStamp.cpp TimeStamp.h Types.h Value.cpp 
Log Message:
change source OdbcJdbc, for execute make from MinGW, Bcc55 and other compiles
 branch v1-1-beta

Index: Connection.h
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/Connection.h,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -b -U3 -r1.8.2.6 -r1.8.2.7
--- Connection.h	4 Aug 2003 05:44:43 -0000	1.8.2.6
+++ Connection.h	13 Aug 2003 13:00:20 -0000	1.8.2.7
@@ -554,6 +554,10 @@
     //void		registerOutParameter (int paramIndex, int sqlType, const char* typeName) = 0;
 };
 
+#ifdef __BORLANDC__
+extern "C" __declspec( dllexport ) Connection*	createConnection();
+#else
 extern "C" Connection*	createConnection();
+#endif
 
 #endif // !defined(AFX_CONNECTION_H__BD560E62_B194_11D3_AB9F_0000C01D2301__INCLUDED_)

Index: DateTime.cpp
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/DateTime.cpp,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -b -U3 -r1.6.2.5 -r1.6.2.6
--- DateTime.cpp	19 Jul 2003 12:43:38 -0000	1.6.2.5
+++ DateTime.cpp	13 Aug 2003 13:00:20 -0000	1.6.2.6
@@ -108,7 +108,7 @@
 	const char *end = dateString + length;
 	char string [100], *q = string;
 	bool numeric = true;
-	bool sign = false;
+//	bool sign = false;
 	int		year = -1;
 	int		month = 0;
 	int		day = 0;
@@ -135,7 +135,7 @@
 		switch (c)
 			{
 			case '-':
-				sign = true;
+//				sign = true;
 			case ' ':
 			case ',':
 			case '/':
@@ -196,7 +196,7 @@
 					}
 				q = string;
 				numeric = true;
-				sign = false;
+//				sign = false;
 				break;
 
 			case '(':
@@ -216,7 +216,7 @@
 				break;
 
 			case '+':
-				sign = true;
+//				sign = true;
 				break;
 
 			default:
@@ -297,19 +297,6 @@
 	decodeDate (date, time);
 	return strftime (buffer, length, format, time);
 	
-}
-DateTime& DateTime::operator =(long value)
-{
-	date = value;
-
-	return *this;
-}
-
-DateTime& DateTime::operator =(QUAD value)
-{
-	date = (long) (value / 1000);
-
-	return *this;
 }
 
 long DateTime::getToday()

Index: DateTime.h
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/DateTime.h,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -b -U3 -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- DateTime.h	25 Jul 2003 07:59:29 -0000	1.1.1.1.2.1
+++ DateTime.h	13 Aug 2003 13:00:20 -0000	1.1.1.1.2.2
@@ -30,13 +30,9 @@
 #pragma once
 #endif // _MSC_VER >= 1000
 
-struct tm;
-
 class DateTime  
 {
 public:
-	DateTime& operator = (QUAD value);
-	DateTime& operator = (long value);
 	int getString (int length, char *buffer);
 	int getString (const char * format, int length, char * buffer);
 	double getDouble();
@@ -46,8 +42,8 @@
 	static bool match (const char *str1, const char *str2);
 	static int lookup (const char *string, const char **table);
 	static DateTime convert (const char *string, int length);
-	static signed long decodeDate (signed long nday, tm *times);
-	static signed long encodeDate (tm *times);
+	static signed long decodeDate (signed long nday, struct tm *times);
+	static signed long encodeDate (struct tm *times);
 	static signed long yday (struct tm	*times);
 
 	signed long date;

Index: extodbc.cpp
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/Attic/extodbc.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -b -U3 -r1.1.2.1 -r1.1.2.2
--- extodbc.cpp	26 May 2003 08:31:37 -0000	1.1.2.1
+++ extodbc.cpp	13 Aug 2003 13:00:20 -0000	1.1.2.2
@@ -105,7 +105,6 @@
 
 	for(d = buffer, info = info_buf; *d != isc_info_end;) 
 	{
-		value_out = 0;
 		item = *d++;
 		length = GDS->_vax_integer(d, 2);
 		d += 2;
@@ -396,7 +395,7 @@
 
 	p = (char *)info_buffer;
 
-	while ((c = *string++) && c != '$')
+	while ((c = *string++),c && c != '$')
 	{
 		if (c != '!')
 			*p++ = c;

Index: IscArray.cpp
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/Attic/IscArray.cpp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -b -U3 -r1.1.2.4 -r1.1.2.5
--- IscArray.cpp	4 Aug 2003 05:44:43 -0000	1.1.2.4
+++ IscArray.cpp	13 Aug 2003 13:00:21 -0000	1.1.2.5
@@ -263,7 +263,7 @@
 void IscArray::writeArray(Value * value)
 {
 	int i,offset;
-	bool bString;
+//	bool bString;
 	char * ptCh, * ptSrc;
 	char * ptDst = (char*)arrBufData;
 
@@ -273,7 +273,7 @@
 		{
 			int len;
 			Blob *blob = value->data.blob;
-			for (offset = 0; len = blob->getSegmentLength (offset); offset += len)
+			for (offset = 0; len = blob->getSegmentLength(offset), len; offset += len)
 				memcpy(&ptDst[offset],(char*) blob->getSegment (offset),len);
 		}
 		break;
@@ -295,7 +295,7 @@
 			{
 				char * pt;
 				int len,lenSrc;
-				bString = true;
+//				bString = true;
 				++ptCh;
 				while(*ptCh && *ptCh!='\'')
 					ptCh++;
@@ -347,8 +347,8 @@
 					continue;
 				}
 			}
-			else 
-				bString = false;
+//			else 
+//				bString = false;
 //
 			while(*ptCh && (isdigit(*ptCh) || *ptCh=='.'))
 				ptCh++;

Index: IscConnection.cpp
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/IscConnection.cpp,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -b -U3 -r1.5.2.2 -r1.5.2.3
--- IscConnection.cpp	4 Aug 2003 05:44:43 -0000	1.5.2.2
+++ IscConnection.cpp	13 Aug 2003 13:00:21 -0000	1.5.2.3
@@ -58,12 +58,13 @@
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
 
-extern "C"
-{
-Connection* createConnection()
+#ifdef __BORLANDC__
+extern "C" __declspec( dllexport ) Connection* createConnection()
+#else
+extern "C" Connection* createConnection()
+#endif
 {
 	return new IscConnection;
-}
 }
 
 IscConnection::IscConnection()

Index: IscStatement.cpp
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/IscStatement.cpp,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -b -U3 -r1.8.2.5 -r1.8.2.6
--- IscStatement.cpp	4 Aug 2003 05:44:43 -0000	1.8.2.5
+++ IscStatement.cpp	13 Aug 2003 13:00:21 -0000	1.8.2.6
@@ -504,27 +504,9 @@
 			case SQL_TIMESTAMP:
 				{
 				ISC_TIMESTAMP *date = (ISC_TIMESTAMP*) var->sqldata;
-//				long days = date->timestamp_date;
-
-//Orig.
-// B. Schulte comments:
-// 'this is really not needed anymore.... maybe the date gets wrong in stoneage ;-)'
-//                if ((days > 24855) || (days < -24885))
-//					throw SQLEXCEPTION (CONVERSION_ERROR, "date out of range");
-
 				TimeStamp timestamp;
-//Orig.
-/*
-				timestamp = (long) ((days * 24 * 60 * 60) + date->timestamp_time / 10000);
-				timestamp.nanos = (date->timestamp_time / 10000) * 100;
-*/
-//From B. Schulte
-//				long        zeit;
-//				zeit = (date->timestamp_time / 10000);
-
-				timestamp = date->timestamp_date;
+				timestamp.date = date->timestamp_date;
 				timestamp.nanos = date->timestamp_time;
-
 				value->setValue (timestamp);
 				}
 				break;
@@ -534,8 +516,7 @@
 				ISC_DATE date = *(ISC_DATE*) var->sqldata;
 				long days = date;
 				DateTime dateTime;
-//				dateTime = (long) (days * 24 * 60 * 60);//NOMEY -
-				dateTime = days; //NOMEY +
+				dateTime.date = days; //NOMEY +
 				value->setValue (dateTime);
 				}
 				break;
@@ -544,7 +525,7 @@
 				{
 				ISC_TIME data = *(ISC_TIME*) var->sqldata;
 				SqlTime time;
-				time = data;
+				time.timeValue = data;
 				value->setValue (time);
 				}
 				break;

Index: SqlTime.cpp
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/SqlTime.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -b -U3 -r1.1.2.1 -r1.1.2.2
--- SqlTime.cpp	19 Jul 2003 12:43:38 -0000	1.1.2.1
+++ SqlTime.cpp	13 Aug 2003 13:00:21 -0000	1.1.2.2
@@ -26,19 +26,10 @@
 #include <time.h>
 #include <string.h>
 
-SqlTime& SqlTime::operator =(long value)
-{
-	timeValue = value;
-
-	return *this;
-}
-
-
-
 SqlTime SqlTime::convert(const char * string, int length)
 {
 	SqlTime time;
-	time = 0;
+	time.timeValue = 0;
 	return time;
 }
 

Index: SqlTime.h
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/SqlTime.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -b -U3 -r1.1 -r1.1.2.1
--- SqlTime.h	2 Jul 2001 23:23:54 -0000	1.1
+++ SqlTime.h	13 Aug 2003 13:00:21 -0000	1.1.2.1
@@ -32,7 +32,6 @@
 class SqlTime
 {
 public:
-	SqlTime& operator = (long value);
 	static SqlTime convert (const char *string, int length);
 	int getString (int length, char *buffer);
 	int getString (const char * format, int length, char *buffer);

Index: TimeStamp.cpp
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/TimeStamp.cpp,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -b -U3 -r1.3.2.2 -r1.3.2.3
--- TimeStamp.cpp	26 Jul 2003 13:12:09 -0000	1.3.2.2
+++ TimeStamp.cpp	13 Aug 2003 13:00:21 -0000	1.3.2.3
@@ -31,39 +31,19 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-
+#ifdef __BORLANDC__
+#include <iostream.h>
+#else
+#include <stdio.h>
+#endif
 #include "IscDbc.h"
 #include "TimeStamp.h"
-#include <stdio.h>
 #include <time.h>
 #include <string.h>
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
-
-
-TimeStamp& TimeStamp::operator =(DateTime value)
-{
-//Orig.
-	date = value.date;
-	nanos = 0;
-
-//From B. Schulte
-// convert DateTime to 'new' TimeStamp
-//    date = value.date / 24/60/60;
-//    nanos = value.date - (date * 24*60*60);
-
-	return *this;
-}
-
-TimeStamp& TimeStamp::operator =(long value)
-{
-	date = value;
-	nanos = 0;
-
-	return *this;
-}
 
 int TimeStamp::getTimeString(int length, char * buffer)
 {

Index: TimeStamp.h
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/TimeStamp.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -b -U3 -r1.3 -r1.3.2.1
--- TimeStamp.h	2 Jul 2001 22:57:51 -0000	1.3
+++ TimeStamp.h	13 Aug 2003 13:00:21 -0000	1.3.2.1
@@ -33,15 +33,11 @@
 #include "SqlTime.h"
 #include "DateTime.h"
 
-struct tm;
-
 class TimeStamp : public DateTime
 {
 public:
 	int getTimeString(int length, char * buffer);
-	int decodeTime (long nanos, tm * times);
-	TimeStamp& operator = (long value);
-	TimeStamp& operator = (DateTime value);
+	int decodeTime (long nanos, struct tm * times);
 
 	long	nanos;					// nano seconds
 };

Index: Types.h
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/Types.h,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -b -U3 -r1.4.2.1 -r1.4.2.2

Index: Value.cpp
===================================================================
RCS file: /cvsroot/firebird/OdbcJdbc/IscDbc/Value.cpp,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -b -U3 -r1.7.2.4 -r1.7.2.5
--- Value.cpp	4 Aug 2003 05:48:13 -0000	1.7.2.4
+++ Value.cpp	13 Aug 2003 13:00:21 -0000	1.7.2.5
@@ -673,7 +673,7 @@
 		case Null:
 			{
 			DateTime date;
-			date = (long) 0;
+			date.date = (long) 0;
 			return date;
 			}
 
@@ -711,7 +711,8 @@
 		return data.timestamp;
 
 	TimeStamp timestamp;
-	timestamp = getDate();
+	timestamp.date = getDate().date;
+	timestamp.nanos = 0;
 
 	return timestamp;
 }
@@ -727,7 +728,7 @@
 {
 	clear();
 	type = Date;
-	data.date = value;
+	data.date.date = value;
 }
 
 void Value::allocString(Type typ, int length)
@@ -878,10 +879,7 @@
 {
 	clear();
 	type = Timestamp;
-//Orig.
-//	data.timestamp = value;
-//From B. Schulte
-    data.timestamp = value.date;
+    data.timestamp.date = value.date;
     data.timestamp.nanos = value.nanos;
 }
 
@@ -892,7 +890,7 @@
 		case Null:
 			{
 			SqlTime time ;
-			time = 0;
+			time.timeValue = 0;
 			return time;
 			}

Update of /cvsroot/firebird/OdbcJdbc/Builds/Bcc55.win
In directory sc8-pr-cvs1:/tmp/cvs-serv17788

Added Files:
      Tag: v1-1-beta
	makefile.bcc55 
Log Message:
add  makefile for BCC55

--- makefile.bcc55 ADDED ---

Update of /cvsroot/firebird/OdbcJdbc/Builds/Bcc55.win
In directory sc8-pr-cvs1:/tmp/cvs-serv17020/Bcc55.win

Log Message:
Directory /cvsroot/firebird/OdbcJdbc/Builds/Bcc55.win added to the repository
--> Using per-directory sticky tag `v1-1-beta'

Update of /cvsroot/firebird/OdbcJdbc/Builds
In directory sc8-pr-cvs1:/tmp/cvs-serv16619/Builds

Log Message:
Directory /cvsroot/firebird/OdbcJdbc/Builds added to the repository
--> Using per-directory sticky tag `v1-1-beta'

Build Version :  T2.0.0.4246 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4245 2003/08/13 11:45:30 robocop Exp  )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs1:/tmp/cvs-serv11065

Modified Files:
	fun.epp 
Log Message:
Fix SF Bugs #544132 and #728839.
Added some ugly code, too.
More correct null signaling may cause surprise to UDF devs used to some bugs.

Index: fun.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/fun.epp,v
retrieving revision 1.23
retrieving revision 1.24
diff -b -U3 -r1.23 -r1.24
--- fun.epp	4 Aug 2003 10:20:19 -0000	1.23
+++ fun.epp	13 Aug 2003 11:45:30 -0000	1.24
@@ -27,6 +27,7 @@
  *
  * 2003.07.31 Fred Polizo, Jr. - Made FUN_evaluate() correctly determine
  * the length of string types containing binary data (char. set octets).
+ * 2003.08.10 Claudio Valderrama: Fix SF Bugs #544132 and #728839.
  */
 /*
 $Id$
@@ -101,7 +102,6 @@
 	USHORT	length;
 	UCHAR	temp[800];
 	STR		temp_string;
-	SSHORT	unsup_datatype = 0;
 	SLONG	l, *lp;
 
 	TDBB tdbb = GET_THREAD_DATA;
@@ -117,8 +117,8 @@
 	}
 	else
 	{
-		/* Need to align the starting address because it consists of
-		   a number of data blocks with aligned length */
+		// Need to align the starting address because it consists of
+		//   a number of data blocks with aligned length
 
 		temp_string =
 			FB_NEW_RPT(*tdbb->tdbb_default,
@@ -132,15 +132,27 @@
 	SLONG*		arg_ptr		= args;
 	LLS			blob_stack	= 0;
 	LLS			array_stack = 0;
+	
 	JRD_REQ			request		= tdbb->tdbb_request;
-	USHORT		null_flag	= (USHORT)(request->req_flags & req_null);
+	// CVC: restoring the null flag seems like a Borland hack to try to
+	// patch a bug with null handling. There's no evident reason to restore it
+    // because EVL_expr() resets it every time it's called.	Kept it for now.
+	bool null_flag	= (request->req_flags & req_null) == req_null;
+	
 	fun_repeat*	return_ptr	= function->fun_rpt + function->fun_return_arg;
 	JRD_NOD*		ptr			= node->nod_arg;
 
 	value->vlu_desc = return_ptr->fun_desc;
 	value->vlu_desc.dsc_address = (UCHAR *) & value->vlu_misc;
 
-/* Trap any potential errors */
+	// We don't know or can't handle the data type is some cases.
+	bool unsup_datatype = false;
+	
+	// We'll use to this trick to give the UDF a way to signal
+    // "I sent a null blob" when not using descriptors.
+	BLOB return_blob_struct = 0;
+
+// Trap any potential errors
 
 #pragma FB_COMPILER_MESSAGE("Note that we cannot use C++ EH here for Win32 SS!")
 #if !defined(SUPERSERVER) && !defined(WIN_NT)
@@ -152,7 +164,6 @@
 	// If the return data type is any of the string types,
 	// allocate space to hold value
 
-
 	if (value->vlu_desc.dsc_dtype <= dtype_varying)
 	{
 		length = value->vlu_desc.dsc_length;
@@ -180,8 +191,12 @@
 	{
 		DSC* input;
 		if (tail == return_ptr) {
-			input = &value->vlu_desc; /*(DSC*) value;*/
-		} else {
+			input = &value->vlu_desc; // (DSC*) value;
+			// CVC: The return param we build for the UDF is not null!!!
+			// This closes SF Bug #544132.
+			request->req_flags &= ~req_null;
+		}	
+		else {
 			input = EVL_expr(tdbb, *ptr++);
 		}
 		SLONG**	ap = (SLONG **) arg_ptr;
@@ -190,6 +205,15 @@
 		// nothing left to be done
 
 		if (tail->fun_mechanism == FUN_descriptor) {
+            // CVC: We have to protect the UDF from Borland's ill null signaling
+            // See EVL_expr(...), case nod_field for reference: the request may be
+            // signaling NULL, but the placeholder field created by EVL_field(...)
+            // doesn't carry the null flag in the descriptor. Why Borland didn't
+            // set on such flag is maybe because it only has local meaning.
+            // This closes SF Bug #728839.
+            if ((request->req_flags & req_null) && !(input->dsc_flags & DSC_null))
+			    *ap++ = 0;
+			else
 			*ap++ = (SLONG *) input;
 			arg_ptr = (SLONG *) ap;
 			continue;
@@ -199,7 +223,7 @@
 		temp_desc.dsc_address = temp_ptr;
 		length = FB_ALIGN(temp_desc.dsc_length, DOUBLE_ALIGN);
 
-		/* If we've got a null argument, just pass zeros (got any better ideas?) */
+		// If we've got a null argument, just pass zeros (got any better ideas?)
 
 		if (!input || (request->req_flags & req_null))
 		{
@@ -350,9 +374,9 @@
 					MOV_move(input, &temp_desc);
 				break;
 
-			/* CVC: There's no other solution for now: timestamp can't be returned
-					by value and the other way is to force the user to pass a dummy value as
-					an argument to keep the engine happy. So, here's the hack. */
+			// CVC: There's no other solution for now: timestamp can't be returned
+			//		by value and the other way is to force the user to pass a dummy value as
+			//		an argument to keep the engine happy. So, here's the hack.
 			case dtype_timestamp:
 			    if (tail == return_ptr)
 				{
@@ -372,6 +396,7 @@
 
 			case dtype_blob:
 				{
+				// This is not a descriptor pointing to a blob. This is a blob struct.
 				BLOB blob_desc = (BLOB) temp_ptr;
 				BLB  blob;
 				length = sizeof(struct blob);
@@ -380,6 +405,7 @@
 					blob =
 						BLB_create(tdbb, tdbb->tdbb_request->req_transaction,
 								   (BID) & value->vlu_misc);
+					return_blob_struct = blob_desc;
 				}
 				else
 				{
@@ -489,7 +515,7 @@
 
 		case dtype_timestamp:
 		default:
-			unsup_datatype = 1;
+			unsup_datatype = true;
 			break;
 		}
 	}
@@ -502,12 +528,17 @@
 
 		if (temp_ptr != NULL)
 		{
-			/* CVC: Allow processing of return by descriptor.
-					The assumption is that the user didn't modify the return type,
-					that has no sense after all, because it is carved in stone. */
+			// CVC: Allow processing of return by descriptor.
+			//		The assumption is that the user didn't modify the return type,
+			//		that has no sense after all, because it is carved in stone.
+			DSC* return_dsc = 0;
 			if (return_ptr->fun_mechanism == FUN_descriptor)
 			{
-				temp_ptr = ((DSC*) temp_ptr)->dsc_address;
+			    // The formal param's type is contained in value->vlu_desc.dsc_dtype
+			    // but I want to know if the UDF changed it to a compatible type
+			    // from its returned descriptor, that will be return_dsc.
+                return_dsc = reinterpret_cast<DSC*>(temp_ptr);
+				temp_ptr = return_dsc->dsc_address;
 			}
 			if (temp_ptr)
 			{
@@ -515,9 +546,24 @@
 				{
 				case dtype_sql_date:
 				case dtype_sql_time:
+				    value->vlu_misc.vlu_long = *(SLONG *) temp_ptr;
+				    break;
+				    
+				case dtype_long:
+				    if (return_dsc) switch(return_dsc->dsc_dtype) {
+                    case dtype_short:
+                        value->vlu_misc.vlu_long = *(SSHORT *) temp_ptr;
+                        break;
 				case dtype_long:
 					value->vlu_misc.vlu_long = *(SLONG *) temp_ptr;
 					break;
+                    default:
+                        unsup_datatype = true;
+                        break;
+				    }
+				    else
+					    value->vlu_misc.vlu_long = *(SLONG *) temp_ptr;
+					break;
 
 				case dtype_short:
 					value->vlu_misc.vlu_short = *(SSHORT *) temp_ptr;
@@ -528,6 +574,21 @@
 					break;
 
 				case dtype_int64:
+				    if (return_dsc) switch(return_dsc->dsc_dtype) {
+				    case dtype_short:
+				        value->vlu_misc.vlu_int64 = *(SSHORT *) temp_ptr;
+				        break;
+                    case dtype_long:
+                        value->vlu_misc.vlu_int64 = *(SLONG *) temp_ptr;
+                        break;
+				    case dtype_int64:
+				        value->vlu_misc.vlu_int64 = *(SINT64 *) temp_ptr;
+				        break;
+				    default:
+                        unsup_datatype = true;
+                        break;
+				    }
+				    else
 					value->vlu_misc.vlu_int64 = *(SINT64 *) temp_ptr;
 					break;
 
@@ -545,9 +606,8 @@
                     break;
                                        
 				case dtype_cstring:
-                    /* For the ttype_binary char. set, this will truncate
-                     * the string after the first zero octet copied.
-                     */
+                    // For the ttype_binary char. set, this will truncate
+                    // the string after the first zero octet copied.
                     temp_desc = value->vlu_desc;
                     temp_desc.dsc_address = temp_ptr;
                     temp_desc.dsc_length =
@@ -572,11 +632,11 @@
 					break;
 
 				default:
-					unsup_datatype = 1;
+					unsup_datatype = true;
 					break;
 				}
-				/* check if this is function has the FREE_IT set, if set and
-				   return_value is not null, then free the return value */
+				// check if this is function has the FREE_IT set, if set and
+				//   return_value is not null, then free the return value
 				if (((SLONG) return_ptr->fun_mechanism < 0) && temp_ptr)
 					free(temp_ptr);
 			}
@@ -586,7 +646,7 @@
 	END_CHECK_FOR_EXCEPTIONS((TEXT*)function->fun_exception_message);
 
 	if (unsup_datatype) {
-		IBERROR(169);			/* msg 169 return data type not supported */
+		IBERROR(169);			// msg 169 return data type not supported
 	}
 
 #if !defined(SUPERSERVER) && !defined(WIN_NT)
@@ -600,7 +660,9 @@
 	}
 #endif
 
-	delete temp_string;
+    // We can't do this here: if temp_string was allocated, temp_ptr points to it
+    // if the length of the stack-based buffer is not enough. Moved below.
+	//delete temp_string;
 
 	while (blob_stack)
 	{
@@ -612,9 +674,18 @@
 		delete[] (UCHAR*)LLS_POP(&array_stack);
 	}
 
+    // We acknowledge null in three cases:
+    // a) temp_ptr = udf(); returns a null pointer
+    // b) Udf used RETURNS PARAMETER <n> for a descriptor whose DSC_flag is activated
+    // c) Udf used RETURNS PARAMETER <n> for a blob and made the blob handle null,
+    // because there's no current way to do that. Notice that it doesn't affect
+    // the engine internals, since blob_struct is a mere wrapper around the blob.
+    // Udfs work in the assumption that they ignore that the handle is the real
+    // internal blob and this has been always the tale.
 	if (temp_ptr == NULL || function->fun_return_arg &&
-		return_ptr->fun_mechanism == FUN_descriptor &&
-		(value->vlu_desc.dsc_flags & DSC_null))
+		(return_ptr->fun_mechanism == FUN_descriptor &&	(value->vlu_desc.dsc_flags & DSC_null)
+        || return_ptr->fun_mechanism == FUN_blob_struct && return_blob_struct &&
+            !return_blob_struct->blob_handle))
 	{
 		request->req_flags |= req_null;
 	}
@@ -622,7 +693,11 @@
 	{
 		request->req_flags &= ~req_null;
 	}
-	request->req_flags |= null_flag;
+	
+	delete temp_string;
+	
+	if (null_flag)
+	   request->req_flags |= req_null;
 }

Build Version :  T2.0.0.4245 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4244 2003/08/13 11:26:39 alexpeshkoff )

Update of /cvsroot/firebird/firebird2/builds/win32/msvc6
In directory sc8-pr-cvs1:/tmp/cvs-serv8541

Modified Files:
	gfix.dsp 
Log Message:
Also fix MSVC6 gfix build in head branch

Index: gfix.dsp
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc6/gfix.dsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -U3 -r1.17 -r1.18
--- gfix.dsp	5 Jul 2003 03:17:39 -0000	1.17
+++ gfix.dsp	13 Aug 2003 11:26:38 -0000	1.18
@@ -123,6 +123,10 @@
 
 SOURCE=..\..\..\src\jrd\isc.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\classes\locks.cpp
+# End Source File
 # End Group
 # Begin Group "Header files"

Build Version :  T2.0.0.4238 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4237 2003/08/13 11:06:05 robocop Exp  )

Update of /cvsroot/firebird/firebird2/examples/api
In directory sc8-pr-cvs1:/tmp/cvs-serv5625

Modified Files:
	apifull.c 
Log Message:
Let's hope the cure is not worse than the sickness
Took VARY from ibase.h

Index: apifull.c
===================================================================
RCS file: /cvsroot/firebird/firebird2/examples/api/apifull.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -U3 -r1.2 -r1.3
--- apifull.c	11 Jul 2003 03:08:30 -0000	1.2
+++ apifull.c	13 Aug 2003 11:06:02 -0000	1.3
@@ -48,10 +48,15 @@
 void print_column (XSQLVAR * var);
 int get_statement (char * buf);
 
-typedef struct vary2 {
-    short          vary_length;
+/* ibase.h contains PARAMVARY, with the handicap that vary_string is unsigned char*
+instead of plain char*.
+Maybe we should fix ibase.h for users but without affecting the engine */
+/* typedef struct vary2 {
+    unsigned short vary_length;
     char           vary_string [1];
 } VARY2;
+*/
+typedef PARAMVARY VARY2;
 
 isc_db_handle      db = NULL;
 isc_tr_handle      trans = NULL;

Build Version :  T2.0.0.4244 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4243 2003/08/13 11:13:22 alexpeshkoff )

Update of /cvsroot/firebird/firebird2/builds/win32/msvc6
In directory sc8-pr-cvs1:/tmp/cvs-serv6845/win32/msvc6

Modified Files:
      Tag: B1_5_Release
	gfix.dsp 
Log Message:
Fixed MSVC6 gfix build

Index: gfix.dsp
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc6/gfix.dsp,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -b -U3 -r1.17 -r1.17.2.1
--- gfix.dsp	5 Jul 2003 03:17:39 -0000	1.17
+++ gfix.dsp	13 Aug 2003 11:13:21 -0000	1.17.2.1
@@ -123,6 +123,10 @@
 
 SOURCE=..\..\..\src\jrd\isc.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\common\classes\locks.cpp
+# End Source File
 # End Group
 # Begin Group "Header files"

Build Version :  T2.0.0.4242 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4241 2003/08/13 11:11:13 robocop Exp  )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs1:/tmp/cvs-serv6497

Modified Files:
	cch.cpp 
Log Message:
Kill two warnings in Win32

Index: cch.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/cch.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -b -U3 -r1.40 -r1.41
--- cch.cpp	9 Aug 2003 20:58:34 -0000	1.40
+++ cch.cpp	13 Aug 2003 11:11:12 -0000	1.41
@@ -1255,7 +1255,9 @@
 					 TRUE)) CCH_unwind(tdbb, TRUE);
 #endif
 			if (release_flag)
+			{
 				PAGE_LOCK_RELEASE(bdb->bdb_lock);
+			}
 			if (latch == LATCH_exclusive)
 				release_bdb(tdbb, bdb, FALSE, FALSE, FALSE);
 		}
@@ -2265,7 +2267,9 @@
 		BUGCHECK(209);			/* msg 209 attempt to release page not acquired */
 
 	if (!use_count && (bdb->bdb_ast_flags & BDB_blocking))
+	{
 		PAGE_LOCK_RE_POST(bdb->bdb_lock);
+	}
 
 	window->win_bdb = NULL;
 }
@@ -2916,7 +2920,9 @@
 		/* re-post the lock only if it was really written */
 
 		if ((bdb->bdb_ast_flags & BDB_blocking) &&
-			!(bdb->bdb_flags & BDB_dirty)) PAGE_LOCK_RE_POST(bdb->bdb_lock);
+			!(bdb->bdb_flags & BDB_dirty)) {
+			PAGE_LOCK_RE_POST(bdb->bdb_lock);
+		}
 		BTC_MUTEX_ACQUIRE;
 	}
 
@@ -3618,9 +3624,11 @@
 		bcb->bcb_free = precedence;
 		if (!(precedence->pre_flags & PRE_cleared)) {
 			if (low_bdb->bdb_ast_flags & BDB_blocking)
+			{
 				PAGE_LOCK_RE_POST(low_bdb->bdb_lock);
 		}
 	}
+	}
 
 	PRE_MUTEX_RELEASE;
 }
@@ -5289,7 +5297,9 @@
 	LATCH_MUTEX_RELEASE;
 
 	if (bdb->bdb_ast_flags & BDB_blocking)
+	{
 		PAGE_LOCK_RE_POST(bdb->bdb_lock);
+	}
 }

Build Version :  T2.0.0.4241 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4240 2003/08/13 11:09:58 robocop Exp  )

Update of /cvsroot/firebird/firebird2/src/dsql
In directory sc8-pr-cvs1:/tmp/cvs-serv6320

Modified Files:
	gen.cpp 
Log Message:
There are less unnamed fields now.
Changed the code style, too.

Index: gen.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/dsql/gen.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -b -U3 -r1.33 -r1.34
--- gen.cpp	26 Jun 2003 10:44:15 -0000	1.33
+++ gen.cpp	13 Aug 2003 11:09:57 -0000	1.34
@@ -1923,12 +1923,8 @@
  **/
 static void gen_relation( DSQL_REQ request, DSQL_CTX context)
 {
-	DSQL_REL relation;
-	DSQL_PRC procedure;
-	DSQL_NOD inputs, *ptr, *end;
-
-	relation = context->ctx_relation;
-	procedure = context->ctx_procedure;
+	DSQL_REL relation = context->ctx_relation;
+	DSQL_PRC procedure = context->ctx_procedure;
 
 /* if this is a trigger or procedure , don't want relation id used */
 	if (relation) {
@@ -1962,8 +1958,9 @@
 		}
 		STUFF(context->ctx_context);
 		STUFF_WORD(procedure->prc_in_count);
-		if (inputs = context->ctx_proc_inputs)
-			for (ptr = inputs->nod_arg, end = ptr + inputs->nod_count;
+		DSQL_NOD inputs = context->ctx_proc_inputs;
+		if (inputs)
+			for (DSQL_NOD *ptr = inputs->nod_arg, *end = ptr + inputs->nod_count;
 				 ptr < end; ptr++)
 				GEN_expr(request, *ptr);
 	}
@@ -1984,10 +1981,6 @@
  **/
 void GEN_return( DSQL_REQ request, DSQL_NOD procedure, BOOLEAN eos_flag)
 {
-	DSQL_NOD parameters, parameter, *ptr, *end;
-	VAR variable;
-	USHORT outputs;
-
 	if (!procedure)
 		return;
 
@@ -1996,13 +1989,15 @@
 	STUFF(blr_send);
 	STUFF(1);
 	STUFF(blr_begin);
-	outputs = 0;
-	if (parameters = procedure->nod_arg[e_prc_outputs]) {
-		for (ptr = parameters->nod_arg, end = ptr + parameters->nod_count;
+
+	USHORT outputs = 0;
+	DSQL_NOD parameters = procedure->nod_arg[e_prc_outputs];
+	if (parameters) {
+		for (DSQL_NOD *ptr = parameters->nod_arg, *end = ptr + parameters->nod_count;
 			 ptr < end; ptr++) {
 			outputs++;
-			parameter = *ptr;
-			variable = (VAR) parameter->nod_arg[e_var_variable];
+			DSQL_NOD parameter = *ptr;
+			VAR variable = (VAR) parameter->nod_arg[e_var_variable];
 			STUFF(blr_assignment);
 			STUFF(blr_variable);
 			STUFF_WORD(variable->var_variable_number);
@@ -2044,16 +2039,14 @@
  **/
 static void gen_rse( DSQL_REQ request, DSQL_NOD rse)
 {
-	DSQL_NOD node, list, *ptr, *end;
-
 	if (rse->nod_arg[e_rse_singleton]
 		&& !(request->req_dbb->dbb_flags & DBB_v3)) STUFF(blr_singular);
 
 	STUFF(blr_rse);
 
-	list = rse->nod_arg[e_rse_streams];
+	DSQL_NOD list = rse->nod_arg[e_rse_streams];
 
-/* Handle source streams */
+// Handle source streams
 
 	if (list->nod_type == nod_union) {
 		STUFF(1);
@@ -2061,9 +2054,9 @@
 	}
 	else if (list->nod_type == nod_list) {
 		STUFF(list->nod_count);
-		for (ptr = list->nod_arg, end = ptr + list->nod_count; ptr < end;
+		for (DSQL_NOD *ptr = list->nod_arg, *end = ptr + list->nod_count; ptr < end;
 			 ptr++) {
-			node = *ptr;
+			DSQL_NOD node = *ptr;
 			if (node->nod_type == nod_relation ||
 				node->nod_type == nod_aggregate || node->nod_type == nod_join)
 				GEN_expr(request, node);
@@ -2077,6 +2070,8 @@
 	if (rse->nod_arg[e_rse_lock])
 		STUFF(blr_writelock);
 	
+	DSQL_NOD node;
+
 	if ((node = rse->nod_arg[e_rse_first]) != NULL) {
 		STUFF(blr_first);
 		GEN_expr(request, node);
@@ -2098,7 +2093,7 @@
 	if ((list = rse->nod_arg[e_rse_reduced]) != NULL) {
 		STUFF(blr_project);
 		STUFF(list->nod_count);
-		for (ptr = list->nod_arg, end = ptr + list->nod_count; ptr < end;
+		for (DSQL_NOD *ptr = list->nod_arg, *end = ptr + list->nod_count; ptr < end;
 			 ptr++)
 			GEN_expr(request, *ptr);
 	}
@@ -2145,23 +2140,21 @@
  **/
 static void gen_searched_case( DSQL_REQ request, DSQL_NOD node)
 {
-	DSQL_NOD boolean_list, results_list, *bptr, *rptr, *end;
-
-	/* blr_value_if is used for building the case expression */
+	// blr_value_if is used for building the case expression
 
 	STUFF(blr_cast);
 	gen_descriptor(request, &node->nod_desc, TRUE);
 	SSHORT count = node->nod_arg[e_searched_case_search_conditions]->nod_count;
-	boolean_list = node->nod_arg[e_searched_case_search_conditions];
-	results_list = node->nod_arg[e_searched_case_results];
-	for (bptr = boolean_list->nod_arg, end = bptr + count, rptr = results_list->nod_arg; 
+	DSQL_NOD boolean_list = node->nod_arg[e_searched_case_search_conditions];
+	DSQL_NOD results_list = node->nod_arg[e_searched_case_results];
+	for (DSQL_NOD *bptr = boolean_list->nod_arg, *end = bptr + count, *rptr = results_list->nod_arg; 
 			bptr < end; bptr++, rptr++)
 	{
 		STUFF(blr_value_if);
 		GEN_expr(request, *bptr);
 		GEN_expr(request, *rptr);
 	}
-	/* else_result */
+	// else_result
 	GEN_expr(request, node->nod_arg[e_searched_case_results]->nod_arg[count]);
 }
 
@@ -2179,17 +2172,11 @@
  **/
 static void gen_select( DSQL_REQ request, DSQL_NOD rse)
 {
-	DSQL_NOD list, *ptr, *end, item, alias, map_node;
-	PAR parameter;
-	DSQL_MSG message;
 	DSQL_FLD field;
 	DSC constant_desc;
 	DSQL_REL relation;
-	UDF udf;
 	DSQL_CTX context;
-	STR string;
 	SSHORT constant;
-	MAP map;
 
 	constant_desc.dsc_dtype = dtype_short;
 	constant_desc.dsc_scale = 0;
@@ -2200,15 +2187,18 @@
 
 /* Set up parameter for things in the select list */
 
-	list = rse->nod_arg[e_rse_items];
-	for (ptr = list->nod_arg, end = ptr + list->nod_count; ptr < end; ptr++) {
-		item = *ptr;
-		parameter = MAKE_parameter(request->req_receive, TRUE, TRUE, 0);
+	DSQL_NOD list = rse->nod_arg[e_rse_items];
+	for (DSQL_NOD *ptr = list->nod_arg, *end = ptr + list->nod_count; ptr < end; ptr++) {
+		DSQL_NOD item = *ptr;
+		PAR parameter = MAKE_parameter(request->req_receive, TRUE, TRUE, 0);
 		parameter->par_node = item;
 		MAKE_desc(&parameter->par_desc, item);
-		if (item->nod_type == nod_field) {
+		char  *name_alias = NULL;
+
+		switch(item->nod_type) {
+		case nod_field: {
 			field = (DSQL_FLD) item->nod_arg[e_fld_field];
-			parameter->par_name = parameter->par_alias = field->fld_name;
+			name_alias = field->fld_name;
 			context = (DSQL_CTX) item->nod_arg[e_fld_context];
 			if (context->ctx_relation) {
 				parameter->par_rel_name = context->ctx_relation->rel_name;
@@ -2218,18 +2208,19 @@
 				parameter->par_rel_name = context->ctx_procedure->prc_name;
 				parameter->par_owner_name = context->ctx_procedure->prc_owner;
 			}
+			break;
 		}
-		else if (item->nod_type == nod_dbkey) {
-			parameter->par_alias = const_cast < char *>(db_key_name);
-			parameter->par_name = const_cast < char *>(db_key_name);
+		case nod_dbkey: {
+			parameter->par_name = parameter->par_alias = const_cast<char*>(db_key_name);
 			context = (DSQL_CTX) item->nod_arg[0]->nod_arg[0];
 			parameter->par_rel_name = context->ctx_relation->rel_name;
 			parameter->par_owner_name = context->ctx_relation->rel_owner;
+			break;
 		}
-		else if (item->nod_type == nod_alias) {
-			string = (STR) item->nod_arg[e_alias_alias];
+		case nod_alias: {
+			STR string = (STR) item->nod_arg[e_alias_alias];
 			parameter->par_alias = (TEXT *) string->str_data;
-			alias = item->nod_arg[e_alias_value];
+			DSQL_NOD alias = item->nod_arg[e_alias_value];
 			if (alias->nod_type == nod_field) {
 				field = (DSQL_FLD) alias->nod_arg[e_fld_field];
 				parameter->par_name = field->fld_name;
@@ -2247,99 +2238,148 @@
 				}
 			}
 			else if (alias->nod_type == nod_dbkey) {
-				parameter->par_name = const_cast < char *>(db_key_name);
+				parameter->par_name = const_cast<char*>(db_key_name);
 				context = (DSQL_CTX) alias->nod_arg[0]->nod_arg[0];
 				parameter->par_rel_name = context->ctx_relation->rel_name;
 				parameter->par_owner_name = context->ctx_relation->rel_owner;
 			}
+			break;
 		}
-		else if (item->nod_type == nod_map) {
-			map = (MAP) item->nod_arg[e_map_map];
-			map_node = map->map_node;
+		case nod_map: {
+			MAP map = (MAP) item->nod_arg[e_map_map];
+			DSQL_NOD map_node = map->map_node;
 			while (map_node->nod_type == nod_map) {
-				/* skip all the nod_map nodes */
+				// skip all the nod_map nodes
 				map = (MAP) map_node->nod_arg[e_map_map];
 				map_node = map->map_node;
 			}
-			if (map_node->nod_type == nod_field) {
+			switch(map_node->nod_type) {
+			case nod_field: {
 				field = (DSQL_FLD) map_node->nod_arg[e_fld_field];
-				parameter->par_name = parameter->par_alias = field->fld_name;
+				name_alias = field->fld_name;
+				break;
 			}
-			else if (map_node->nod_type == nod_alias) {
-				string = (STR) map_node->nod_arg[e_alias_alias];
+			case nod_alias: {
+				STR string = (STR) map_node->nod_arg[e_alias_alias];
 				parameter->par_alias = (TEXT *) string->str_data;
-				alias = map_node->nod_arg[e_alias_value];
+				DSQL_NOD alias = map_node->nod_arg[e_alias_value];
 				if (alias->nod_type == nod_field) {
 					field = (DSQL_FLD) alias->nod_arg[e_fld_field];
 					parameter->par_name = field->fld_name;
 				}
+				break;
 			}
-			else if (map_node->nod_type == nod_agg_count)
-				parameter->par_name = parameter->par_alias = "COUNT";
-			else if (map_node->nod_type == nod_agg_total)
-				parameter->par_name = parameter->par_alias = "SUM";
-			else if (map_node->nod_type == nod_agg_average)
-				parameter->par_name = parameter->par_alias = "AVG";
-			else if (map_node->nod_type == nod_agg_total2)
-				parameter->par_name = parameter->par_alias = "SUM";
-			else if (map_node->nod_type == nod_agg_average2)
-				parameter->par_name = parameter->par_alias = "AVG";
-			else if (map_node->nod_type == nod_agg_min)
-				parameter->par_name = parameter->par_alias = "MIN";
-			else if (map_node->nod_type == nod_agg_max)
-				parameter->par_name = parameter->par_alias = "MAX";
-		}
-		else if (item->nod_type == nod_udf) {
-			udf = (UDF) item->nod_arg[0];
-			parameter->par_name = parameter->par_alias = udf->udf_name;
-		}
-		else if (item->nod_type == nod_gen_id)
-			parameter->par_name = parameter->par_alias = "GEN_ID";
-		else if (item->nod_type == nod_gen_id2)
-			parameter->par_name = parameter->par_alias = "GEN_ID";
-        else if (item->nod_type == nod_user_name)
-            parameter->par_name = parameter->par_alias  = "USER";
-        else if (item->nod_type == nod_current_role)
-            parameter->par_name = parameter->par_alias  = "ROLE";
-        else if (item->nod_type == nod_internal_info)
-		{
+			case nod_agg_count:
+				name_alias = "COUNT";
+				break;
+			case nod_agg_total:
+				name_alias = "SUM";
+				break;
+			case nod_agg_average:
+				name_alias = "AVG";
+				break;
+			case nod_agg_total2:
+				name_alias = "SUM";
+				break;
+			case nod_agg_average2:
+				name_alias = "AVG";
+				break;
+			case nod_agg_min:
+				name_alias = "MIN";
+				break;
+			case nod_agg_max:
+				name_alias = "MAX";
+				break;
+			} // switch(map_node->nod_type)
+			break;
+			}
+		case nod_udf: {
+			UDF udf = (UDF) item->nod_arg[0];
+			name_alias = udf->udf_name;
+			break;
+			}
+		case nod_gen_id:
+			name_alias	= "GEN_ID";
+			break;
+		case nod_gen_id2:
+			name_alias	= "GEN_ID";
+			break;
+        case nod_user_name:
+            name_alias	= "USER";
+			break;
+        case nod_current_role:
+            name_alias	= "ROLE";
+			break;
+        case nod_internal_info: {
 			internal_info_id id =
 				*reinterpret_cast<internal_info_id*>(item->nod_arg[0]->nod_desc.dsc_address);
-			parameter->par_name = parameter->par_alias = InternalInfo::getAlias(id);
-		}
-        else if (item->nod_type == nod_substr) {
-            /* CVC: SQL starts at 1 but C starts at zero. */
-            /*DSQL_NOD node = item->nod_arg [e_substr_start];
-              --(*(SLONG *) (node->nod_desc.dsc_address));
-              FIXED IN PARSE.Y; here it doesn't catch expressions: Bug 450301. */
-            parameter->par_name = parameter->par_alias  = "SUBSTRING";
-        }
-        else if (item->nod_type == nod_cast)
-            parameter->par_name = parameter->par_alias	= "CAST";
-        else if (item->nod_type == nod_upcase)
-            parameter->par_name = parameter->par_alias	= "UPPER";
+			name_alias = InternalInfo::getAlias(id);
+			break;
 	}
+		case nod_concatenate:
+			name_alias = "CONCATENATION";
+			break;
+        case nod_substr: {
+            // CVC: SQL starts at 1 but C starts at zero.
+            //DSQL_NOD node = item->nod_arg [e_substr_start];
+            //  --(*(SLONG *) (node->nod_desc.dsc_address));
+            //  FIXED IN PARSE.Y; here it doesn't catch expressions: Bug 450301.
+            name_alias = "SUBSTRING";
+			break;
+			}
+        case nod_cast:
+            name_alias	= "CAST";
+			break;
+        case nod_upcase:
+            name_alias	= "UPPER";
+			break;
+		case nod_current_date:
+			name_alias = "CURRENT_DATE";
+			break;
+		case nod_current_time:
+			name_alias = "CURRENT_TIME";
+			break;
+		case nod_current_timestamp:
+			name_alias = "CURRENT_TIMESTAMP";
+			break;
+		case nod_extract:
+			name_alias = "EXTRACT";
+			break;
+		case nod_searched_case:
+		case nod_simple_case:
+			name_alias = "CASE";
+			break;
+		case nod_coalesce:
+			name_alias = "COALESCE";
+			break;
+		} // end switch(item->nod_type)
+		if (name_alias)
+			parameter->par_name = parameter->par_alias = name_alias;
+	} // for (ptr = list->nod_arg
 
-/* Set up parameter to handle EOF */
 
-	request->req_eof = parameter =
-		MAKE_parameter(request->req_receive, FALSE, FALSE, 0);
-	parameter->par_desc.dsc_dtype = dtype_short;
-	parameter->par_desc.dsc_scale = 0;
-	parameter->par_desc.dsc_length = sizeof(SSHORT);
+// Set up parameter to handle EOF 
 
-/* Save DBKEYs for possible update later */
+	{
+		PAR parameter_eof = MAKE_parameter(request->req_receive, FALSE, FALSE, 0);
+		request->req_eof = parameter_eof;
+		parameter_eof->par_desc.dsc_dtype = dtype_short;
+		parameter_eof->par_desc.dsc_scale = 0;
+		parameter_eof->par_desc.dsc_length = sizeof(SSHORT);
+	}
+
+// Save DBKEYs for possible update later
 
 	list = rse->nod_arg[e_rse_streams];
 
 	if (!rse->nod_arg[e_rse_reduced]) {
-		for (ptr = list->nod_arg, end = ptr + list->nod_count; ptr < end;
-			 ptr++)
-			if ((item = *ptr) && (item->nod_type == nod_relation)) {
+		for (ptr = list->nod_arg, end = ptr + list->nod_count; ptr < end; ptr++) {
+			DSQL_NOD item = *ptr;
+			if (item && item->nod_type == nod_relation) {
 				context = (DSQL_CTX) item->nod_arg[e_rel_context];
 				if (relation = context->ctx_relation) {
-					/* Set up dbkey */
-					parameter =
+					// Set up dbkey
+					PAR parameter =
 						MAKE_parameter(request->req_receive, FALSE, FALSE, 0);
 					parameter->par_dbkey_ctx = context;
 					parameter->par_desc.dsc_dtype = dtype_text;
@@ -2347,7 +2387,7 @@
 					parameter->par_desc.dsc_length =
 						relation->rel_dbkey_length;
 
-					/* Set up record version - for post v33 databases */
+					// Set up record version - for post v33 databases
 
 					if (!(request->req_dbb->dbb_flags & DBB_v3)) {
 						parameter =
@@ -2362,6 +2402,7 @@
 				}
 			}
 	}
+	}
 
 #ifdef SCROLLABLE_CURSORS
 /* define the parameters for the scrolling message--offset and direction, 
@@ -2369,7 +2410,7 @@
 
 	if (request->req_type == REQ_SELECT &&
 		request->req_dbb->dbb_base_level >= 5) {
-		parameter = MAKE_parameter(request->req_async, FALSE, FALSE, 0);
+		PAR parameter = MAKE_parameter(request->req_async, FALSE, FALSE, 0);
 		parameter->par_desc.dsc_dtype = dtype_short;
 		parameter->par_desc.dsc_length = sizeof(USHORT);
 		parameter->par_desc.dsc_scale = 0;
@@ -2385,10 +2426,10 @@
 	}
 #endif
 
-/* Generate definitions for the messages */
+// Generate definitions for the messages 
 
 	GEN_port(request, request->req_receive);
-	message = request->req_send;
+	DSQL_MSG message = request->req_send;
 	if (message->msg_parameter)
 		GEN_port(request, message);
 	else
@@ -2399,14 +2440,14 @@
 			GEN_port(request, request->req_async);
 #endif
 
-/* If there is a send message, build a RECEIVE */
+// If there is a send message, build a RECEIVE
 
 	if ((message = request->req_send) != NULL) {
 		STUFF(blr_receive);
 		STUFF(message->msg_number);
 	}
 
-/* Generate FOR loop */
+// Generate FOR loop
 
 	message = request->req_receive;
 
@@ -2419,16 +2460,16 @@
 	STUFF(message->msg_number);
 	STUFF(blr_begin);
 
-/* Build body of FOR loop */
+// Build body of FOR loop
 
-	/* Add invalid usage here */
+	// Add invalid usage here
 	
 	STUFF(blr_assignment);
 	constant = 1;
 	gen_constant(request, &constant_desc, USE_VALUE);
 	gen_parameter(request, request->req_eof);
 
-	for (parameter = message->msg_parameters; parameter;
+	for (PAR parameter = message->msg_parameters; parameter;
 		 parameter = parameter->par_next) {
 		if (parameter->par_node) {
 			STUFF(blr_assignment);
@@ -2472,16 +2513,15 @@
  **/
 static void gen_simple_case( DSQL_REQ request, DSQL_NOD node)
 {
-	DSQL_NOD when_list, results_list, *wptr, *rptr, *end;
-
 	/* blr_value_if is used for building the case expression */
 
 	STUFF(blr_cast);
 	gen_descriptor(request, &node->nod_desc, TRUE);
 	SSHORT count = node->nod_arg[e_simple_case_when_operands]->nod_count;
-	when_list = node->nod_arg[e_simple_case_when_operands];
-	results_list = node->nod_arg[e_simple_case_results];
-	for (wptr = when_list->nod_arg, end = wptr + count, rptr = results_list->nod_arg; 
+	DSQL_NOD when_list = node->nod_arg[e_simple_case_when_operands];
+	DSQL_NOD results_list = node->nod_arg[e_simple_case_results];
+
+	for (DSQL_NOD *wptr = when_list->nod_arg, *end = wptr + count, *rptr = results_list->nod_arg; 
 			wptr < end; wptr++, rptr++)
 	{
 		STUFF(blr_value_if);
@@ -2540,16 +2580,11 @@
  **/
 static void gen_table_lock( DSQL_REQ request, DSQL_NOD tbl_lock, USHORT lock_level)
 {
-	DSQL_NOD tbl_names, *ptr, *end;
-	STR temp;
-	SSHORT flags;
-	USHORT lock_mode;
-
 	if ((!tbl_lock) || (tbl_lock->nod_type != nod_table_lock))
 		return;
 
-	tbl_names = tbl_lock->nod_arg[e_lock_tables];
-	flags = 0;
+	DSQL_NOD tbl_names = tbl_lock->nod_arg[e_lock_tables];
+	SSHORT flags = 0;
 
 	if (tbl_lock->nod_arg[e_lock_mode])
 		flags = tbl_lock->nod_arg[e_lock_mode]->nod_flags;
@@ -2559,9 +2594,9 @@
 	else if (flags & NOD_SHARED)
 		lock_level = gds_tpb_shared;
 
-	lock_mode = (flags & NOD_WRITE) ? gds_tpb_lock_write : gds_tpb_lock_read;
+	USHORT lock_mode = (flags & NOD_WRITE) ? gds_tpb_lock_write : gds_tpb_lock_read;
 
-	for (ptr = tbl_names->nod_arg, end = ptr + tbl_names->nod_count;
+	for (DSQL_NOD *ptr = tbl_names->nod_arg, *end = ptr + tbl_names->nod_count;
 		 ptr < end; ptr++) {
 		if ((*ptr)->nod_type != nod_relation_name)
 			continue;
@@ -2569,7 +2604,7 @@
 		STUFF(lock_mode);
 
 		/* stuff table name */
-		temp = (STR) ((*ptr)->nod_arg[e_rln_name]);
+		STR temp = (STR) ((*ptr)->nod_arg[e_rln_name]);
 		stuff_cstring(request, reinterpret_cast < char *>(temp->str_data));
 
 		STUFF(lock_level);
@@ -2590,10 +2625,9 @@
  **/
 static void gen_udf( DSQL_REQ request, DSQL_NOD node)
 {
-	UDF udf;
 	DSQL_NOD list, *ptr, *end;
 
-	udf = (UDF) node->nod_arg[0];
+	UDF udf = (UDF) node->nod_arg[0];
 	STUFF(blr_function);
 	STUFF_CSTRING(udf->udf_name);
 
@@ -2621,30 +2655,25 @@
  **/
 static void gen_union( DSQL_REQ request, DSQL_NOD union_node)
 {
-	DSQL_NOD sub_rse, *ptr, *end, streams;
-	DSQL_NOD items, *iptr, *iend;
-	USHORT count;
-	DSQL_CTX union_context;
-
 	STUFF(blr_union);
 
-/* Obtain the context for UNION from the first MAP node   */
-	items = union_node->nod_arg[e_rse_items];
-	union_context = (DSQL_CTX) items->nod_arg[0]->nod_arg[e_map_context];
+// Obtain the context for UNION from the first MAP node 
+	DSQL_NOD items = union_node->nod_arg[e_rse_items];
+	DSQL_CTX union_context = (DSQL_CTX) items->nod_arg[0]->nod_arg[e_map_context];
 	STUFF(union_context->ctx_context);
 
-	streams = union_node->nod_arg[e_rse_streams];
+	DSQL_NOD streams = union_node->nod_arg[e_rse_streams];
 	STUFF(streams->nod_count);	/* number of substreams */
 
-	for (ptr = streams->nod_arg, end = ptr + streams->nod_count; ptr < end;
+	for (DSQL_NOD *ptr = streams->nod_arg, *end = ptr + streams->nod_count; ptr < end;
 		 ptr++) {
-		sub_rse = *ptr;
+		DSQL_NOD sub_rse = *ptr;
 		gen_rse(request, sub_rse);
 		items = sub_rse->nod_arg[e_rse_items];
 		STUFF(blr_map);
 		STUFF_WORD(items->nod_count);
-		count = 0;
-		for (iptr = items->nod_arg, iend = iptr + items->nod_count;
+		USHORT count = 0;
+		for (DSQL_NOD *iptr = items->nod_arg, *iend = iptr + items->nod_count;
 			 iptr < iend; iptr++) {
 			STUFF_WORD(count);
 			GEN_expr(request, *iptr);

Build Version :  T2.0.0.4243 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4242 2003/08/13 11:11:48 robocop Exp  )

Update of /cvsroot/firebird/firebird2/builds/win32/msvc6
In directory sc8-pr-cvs1:/tmp/cvs-serv6627

Modified Files:
	fbserver.dsp 
Log Message:
Committed... just in case

Index: fbserver.dsp
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/win32/msvc6/fbserver.dsp,v
retrieving revision 1.31
retrieving revision 1.32
diff -b -U3 -r1.31 -r1.32
--- fbserver.dsp	8 Aug 2003 00:29:43 -0000	1.31
+++ fbserver.dsp	13 Aug 2003 11:11:47 -0000	1.32
@@ -120,5 +120,13 @@
 SOURCE=..\..\..\src\remote\os\win32\window.rc
 # End Source File
 # End Group
+# Begin Source File
+
+SOURCE=..\..\..\src\dsql\gen.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\src\dsql\utld.cpp
+# End Source File
 # End Target
 # End Project

Build Version :  T2.0.0.4240 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4239 2003/08/13 11:08:53 robocop Exp  )

Update of /cvsroot/firebird/firebird2/src/dsql
In directory sc8-pr-cvs1:/tmp/cvs-serv6167

Modified Files:
	utld.cpp 
Log Message:
Little C->C++ style change

Index: utld.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/dsql/utld.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -U3 -r1.12 -r1.13
--- utld.cpp	10 Apr 2003 06:14:59 -0000	1.12
+++ utld.cpp	13 Aug 2003 11:08:50 -0000	1.13
@@ -97,17 +97,16 @@
 									  ISC_STATUS * status,
 									  USHORT dialect,
 									  SCHAR * info,
-XSQLDA * xsqlda, USHORT * return_index)
+				XSQLDA * xsqlda,
+				USHORT * return_index)
 {
-	SCHAR item;
-	SSHORT n;
 	XSQLVAR *xvar, xsqlvar;
 	SQLDA *sqlda;
 	SQLVAR *var;
-	USHORT index, last_index;
+	USHORT last_index = 0;
 
 	if (return_index)
-		*return_index = last_index = 0;
+		*return_index = 0;
 
 	if (!xsqlda)
 		return 0;
@@ -118,7 +117,7 @@
 
 	info += 2;
 
-	n = static_cast<SSHORT> (get_numeric_info(&info));
+	SSHORT n = static_cast<SSHORT> (get_numeric_info(&info));
 	if (dialect >= DIALECT_xsqlda)
 	{
 		if (xsqlda->version != SQLDA_VERSION1)
@@ -142,11 +141,13 @@
 		xvar = &xsqlvar;
 	}
 
-/* Loop over the variables being described. */
+// Loop over the variables being described.
 
+	USHORT index = 0;
 	while (*info != gds_info_end)
 	{
-		while ((item = *info++) != gds_info_sql_describe_end)
+		SCHAR item = *info++;
+		while (item != gds_info_sql_describe_end)
 			switch (item)
 			{
 			case gds_info_sql_sqlda_seq:
@@ -253,14 +254,12 @@
 								   XSQLDA * xsqlda,
 								   USHORT clause)
 {
-	USHORT i, n, blr_len, par_count, dtype, same_flag, msg_len, len, align, offset,
+	USHORT i, n, blr_len, par_count, dtype, msg_len, len, align,
 		null_offset;
-	SSHORT *null_ind;
 	XSQLVAR *xvar, xsqlvar;
 	SQLDA *sqlda;
 	SQLVAR *var;
-	BLOB_PTR *p;				/* one huge pointer per line for LIBS */
-	BLOB_PTR *msg_buf;			/* one huge pointer per line for LIBS */
+	//BLOB_PTR *p;				/* one huge pointer per line for LIBS */
 
 	if (!xsqlda)
 		n = 0;
@@ -350,20 +349,20 @@
 			}
 			dasup->dasup_clauses[clause].dasup_blr =
 				reinterpret_cast<char*>(gds__alloc((SLONG) blr_len));
-			/* FREE: unknown */
-			if (!dasup->dasup_clauses[clause].dasup_blr)	/* NOMEM: */
+			// FREE: unknown
+			if (!dasup->dasup_clauses[clause].dasup_blr)	// NOMEM:
 				return error_dsql_804(status, gds_virmemexh);
 			memset(dasup->dasup_clauses[clause].dasup_blr, 0, blr_len);
 			dasup->dasup_clauses[clause].dasup_blr_buf_len = blr_len;
 			dasup->dasup_clauses[clause].dasup_blr_length = 0;
 		}
 
-		same_flag = (blr_len == dasup->dasup_clauses[clause].dasup_blr_length);
+		bool same_flag = (blr_len == dasup->dasup_clauses[clause].dasup_blr_length);
 
         /* turn off same_flag because it breaks execute & execute2 when
            more than one statement is prepared */
 
-        same_flag = FALSE;
+        same_flag = false;
 
 		dasup->dasup_clauses[clause].dasup_blr_length = blr_len;
 
@@ -371,7 +370,9 @@
 		   the size of the message buffer.  Allow for a null indicator with
 		   each variable in the SQLDA. */
 
-		p = reinterpret_cast <UCHAR*>(dasup->dasup_clauses[clause].dasup_blr);
+		// one huge pointer per line for LIBS
+		BLOB_PTR *p = reinterpret_cast <UCHAR*>(dasup->dasup_clauses[clause].dasup_blr);
+
 	/** The define SQL_DIALECT_V5 is not available here, Hence using
 	constant 1.
     **/
@@ -502,29 +503,30 @@
 				gds__free(dasup->dasup_clauses[clause].dasup_msg);
 			dasup->dasup_clauses[clause].dasup_msg =
 				reinterpret_cast<char*>(gds__alloc((SLONG) msg_len));
-			/* FREE: unknown */
-			if (!dasup->dasup_clauses[clause].dasup_msg)	/* NOMEM: */
+			// FREE: unknown
+			if (!dasup->dasup_clauses[clause].dasup_msg)	// NOMEM:
 				return error_dsql_804(status, gds_virmemexh);
 			memset(dasup->dasup_clauses[clause].dasup_msg, 0, msg_len);
 			dasup->dasup_clauses[clause].dasup_msg_buf_len = msg_len;
 		}
 
-		/* Fill in the return values to the caller. */
+		// Fill in the return values to the caller.
 
 		*blr_length = (same_flag) ? 0 : blr_len;
 		*msg_length = msg_len;
 		*msg_type = 0;
 
-		/* If this is the first call from fetch, we're done. */
+		// If this is the first call from fetch, we're done.
 
 		if (clause == DASUP_CLAUSE_select)
 			return 0;
 	}
 
-/* Move the data between the SQLDA and the message buffer. */
+// Move the data between the SQLDA and the message buffer.
 
-	offset = 0;
-	msg_buf =
+	USHORT offset = 0;
+	// one huge pointer per line for LIBS
+	BLOB_PTR *msg_buf =
 		reinterpret_cast<UCHAR*>(dasup->dasup_clauses[clause].dasup_msg);
 	if (xsqlda)
 		xvar = xsqlda->sqlvar - 1;
@@ -596,7 +598,7 @@
 		if (align)
 			null_offset = FB_ALIGN(null_offset, align);
 
-		null_ind = (SSHORT *) (msg_buf + null_offset);
+		SSHORT *null_ind = (SSHORT *) (msg_buf + null_offset);
 		if (clause == DASUP_CLAUSE_select)
 		{
 			/* Move data from the message into the SQLDA. */
@@ -664,7 +666,6 @@
 void DLL_EXPORT UTLD_save_status_strings( ISC_STATUS * vector)
 {
 	TEXT *p;
-	ISC_STATUS status;
 	USHORT l;
 
 /* allocate space for failure strings if it hasn't already been allocated */
@@ -685,7 +686,7 @@
 
 	while (*vector)
 	{
-		status = *vector;
+		ISC_STATUS status = *vector;
 		vector++;
 		switch (status)
 		{
@@ -754,9 +755,8 @@
  **/
 static ISC_STATUS error_dsql_804( ISC_STATUS * status, ISC_STATUS err)
 {
-	ISC_STATUS *p;
+	ISC_STATUS *p = status;
 
-	p = status;
 	*p++ = gds_arg_gds;
 	*p++ = gds_dsql_error;
 	*p++ = gds_arg_gds;
@@ -784,12 +784,9 @@
  **/
 static SLONG get_numeric_info( SCHAR ** ptr)
 {
-	int item;
-	SSHORT l;
-
-	l = static_cast<SSHORT>(gds__vax_integer(reinterpret_cast<UCHAR*>(*ptr), 2));
+	SSHORT l = static_cast<SSHORT>(gds__vax_integer(reinterpret_cast<UCHAR*>(*ptr), 2));
 	*ptr += 2;
-	item = gds__vax_integer(reinterpret_cast<UCHAR*>(*ptr), l);
+	int item = gds__vax_integer(reinterpret_cast<UCHAR*>(*ptr), l);
 	*ptr += l;
 
 	return item;
@@ -812,20 +809,16 @@
  **/
 static SLONG get_string_info( SCHAR ** ptr, SCHAR * buffer, int buffer_len)
 {
-	SSHORT l, len;
-	SCHAR *p;
-
-	p = *ptr;
-	l =
-		static_cast<SSHORT>
-		(gds__vax_integer(reinterpret_cast<UCHAR*>(p), 2));
+	SCHAR *p = *ptr;
+	SSHORT l = static_cast<SSHORT>(gds__vax_integer(reinterpret_cast<UCHAR*>(p), 2));
 	*ptr += l + 2;
 	p += 2;
 
 	if (l >= buffer_len)
 		l = buffer_len - 1;
 
-	if (len = l)
+	SSHORT len = l;
+	if (len)
 		do
 			*buffer++ = *p++;
 		while (--l);

Build Version :  T2.0.0.4239 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4238 2003/08/13 11:07:33 robocop Exp  )

Update of /cvsroot/firebird/firebird2/src/burp
In directory sc8-pr-cvs1:/tmp/cvs-serv5855

Modified Files:
	backup.epp 
Log Message:
Since stringstream is no longer used, remove the header.

Index: backup.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/burp/backup.epp,v
retrieving revision 1.28
retrieving revision 1.29
diff -b -U3 -r1.28 -r1.29
--- backup.epp	12 Aug 2003 17:32:01 -0000	1.28
+++ backup.epp	13 Aug 2003 11:07:32 -0000	1.29
@@ -43,9 +43,6 @@
 #include "../jrd/ib_stdio.h"
 #include <memory.h>
 #include <string.h>
-#ifndef SOLX86
-#include <sstream>
-#endif
 #include "../burp/burp.h"
 #include "../jrd/ods.h"
 #include "../jrd/align.h"

Build Version :  T2.0.0.4237 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4236 2003/08/13 11:01:41 skidder Exp  )

Update of /cvsroot/firebird/firebird2/src/common/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv5135

Modified Files:
	vector.h 
Log Message:
Change header comment

Index: vector.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/common/classes/vector.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -b -U3 -r1.1 -r1.2
--- vector.h	14 Dec 2002 21:43:18 -0000	1.1
+++ vector.h	13 Aug 2003 11:01:40 -0000	1.2
@@ -1,7 +1,7 @@
 /*
  *	PROGRAM:	Client/Server Common Code
  *	MODULE:		vector.h
- *	DESCRIPTION:	Several fast and simple container classes
+ *	DESCRIPTION:	static array of simple elements
  *
  * The contents of this file are subject to the Interbase Public
  * License Version 1.0 (the "License"); you may not use this file

Build Version :  T2.0.0.4236 Firebird 2.0 Alpha 1

(writeBuildNum.sh,v 1.4235 2003/08/13 10:45:11 aafemt Exp $ )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs1:/tmp/cvs-serv2784

Modified Files:
	btr.cpp nav.cpp val.cpp 
Log Message:
replacing BTR_get_quad() by get_long

Index: btr.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/btr.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -b -U3 -r1.33 -r1.34
--- btr.cpp	28 Jun 2003 12:48:04 -0000	1.33
+++ btr.cpp	13 Aug 2003 10:45:10 -0000	1.34
@@ -30,6 +30,7 @@
 #include "firebird.h"
 #include <string.h>
 #include <stdlib.h>
+#include "memory_routines.h"
 #include "../jrd/ib_stdio.h"
 #include "../jrd/jrd.h"
 #include "../jrd/ods.h"
@@ -189,26 +190,6 @@
 // TMN: Ease C -> C++ conversion. These functions must be outside the
 // extern "C" block since it uses function overloading.
 //
-inline SLONG BTR_get_quad(const UCHAR* p)
-{
-#if defined(i386) || defined(I386) || defined(_M_IX86)
-	// For IA32 (little-endian) this optimization is a _very_ large speed-up!
-	return *reinterpret_cast<const SLONG*>(p);
-#else
-	// Non-IA32
-
-	// Copied from BTR_get_quad(const SCHAR*);
-	LONGCHAR value;
-
-	value.c[0] = p[0];
-	value.c[1] = p[1];
-	value.c[2] = p[2];
-	value.c[3] = p[3];
-
-	return value.n;
-
-#endif	// endianness
-}
 
 inline void quad_put(SLONG value, UCHAR * data)
 {
@@ -504,7 +485,7 @@
 	else {
 		/* if there isn't an upper bound, just walk the index to the end of the level */
 		while (TRUE) {
-			number = BTR_get_quad(BTN_NUMBER(node));
+			number = get_long(BTN_NUMBER(node));
 
 			if (number == END_LEVEL)
 				break;
@@ -587,7 +568,7 @@
 		   and, by definition, is the insertion point.  Otherwise, if the
 		   prefix of the current node is less than the running prefix, the 
 		   node must have a value greater than the key, so it is the insertion
-		   point. */ number = BTR_get_quad(BTN_NUMBER(node));
+		   point. */ number = get_long(BTN_NUMBER(node));
 
 #ifdef IGNORE_NULL_IDX_KEY
 		if (number == END_BUCKET)
@@ -729,7 +710,7 @@
 				node =
 					find_node(page, backwards ? upper : lower,
 							  (USHORT) (idx->idx_flags & idx_descending));
-				number = BTR_get_quad(BTN_NUMBER(node));
+				number = get_long(BTN_NUMBER(node));
 				if (number != END_BUCKET) {
 					page =
 						(BTR) CCH_HANDOFF(tdbb, window, number, LCK_read,
@@ -751,7 +732,7 @@
 #endif
 				node = page->btr_nodes;
 
-			number = BTR_get_quad(BTN_NUMBER(node));
+			number = get_long(BTN_NUMBER(node));
 			page =
 				(BTR) CCH_HANDOFF(tdbb, window, number, LCK_read, pag_index);
 
@@ -770,29 +751,6 @@
 }
 
 
-SLONG BTR_get_quad(const SCHAR* data)
-{
-/**************************************
- *
- *	B T R _ g e t _ q u a d
- *
- **************************************
- *
- * Functional description
- *	Get a four byte binary number.
- *
- **************************************/
-	LONGCHAR value;
-
-	value.c[0] = data[0];
-	value.c[1] = data[1];
-	value.c[2] = data[2];
-	value.c[3] = data[3];
-
-	return value.n;
-}
-
-
 void BTR_insert(TDBB tdbb, WIN * root_window, IIB * insertion)
 {
 /**************************************
@@ -1196,7 +1154,7 @@
 	while (TRUE) {
 		node = BTR_previous_node(node, &enode);
 
-		number = BTR_get_quad(BTN_NUMBER(node));
+		number = get_long(BTN_NUMBER(node));
 #ifdef IGNORE_NULL_IDX_KEY
 		if (number != END_NON_NULL && number != END_BUCKET
 			&& number != END_LEVEL)
@@ -1572,9 +1530,9 @@
 		   the page still has only one node on it */
 
 		node = page->btr_nodes;
-		number = BTR_get_quad(BTN_NUMBER(node));
+		number = get_long(BTN_NUMBER(node));
 		node = NEXT_NODE(node);
-		if (BTR_get_quad(BTN_NUMBER(node)) >= 0) {
+		if (get_long(BTN_NUMBER(node)) >= 0) {
 			CCH_RELEASE(tdbb, &window);
 			CCH_RELEASE(tdbb, root_window);
 			return;
@@ -1751,7 +1709,7 @@
 
 	while (bucket->btr_level) {
 		node = bucket->btr_nodes;
-		page = BTR_get_quad(BTN_NUMBER(node));
+		page = get_long(BTN_NUMBER(node));
 		bucket = (BTR) CCH_HANDOFF(tdbb, &window, page, LCK_read, pag_index);
 	}
 
@@ -1763,7 +1721,7 @@
 
 	while (page) {
 		for (node = bucket->btr_nodes;; node = NEXT_NODE(node)) {
-			page = BTR_get_quad(BTN_NUMBER(node));
+			page = get_long(BTN_NUMBER(node));
 #ifdef IGNORE_NULL_IDX_KEY
 			if (page == END_BUCKET || page == END_LEVEL)
 				break;
@@ -1882,7 +1840,7 @@
 			find_node(bucket, insertion->iib_key,
 					  (USHORT) (insertion->iib_descriptor->idx_flags &
 								idx_descending));
-		page = BTR_get_quad(BTN_NUMBER(node));
+		page = get_long(BTN_NUMBER(node));
 #ifdef IGNORE_NULL_IDX_KEY
 		assert(page != END_NON_NULL);
 #endif /* IGNORE_NULL_IDX_KEY */
@@ -2470,11 +2428,11 @@
 #ifdef IGNORE_NULL_IDX_KEY
 /* do not use 'node' here. It is being passed back to the caller */
 	next = page->btr_nodes;
-	number = BTR_get_quad(BTN_NUMBER(next));
+	number = get_long(BTN_NUMBER(next));
 	if (number == END_LEVEL || number == END_BUCKET)
 #else
 	node = page->btr_nodes;
-	number = BTR_get_quad(BTN_NUMBER(node));
+	number = get_long(BTN_NUMBER(node));
 	if (number < 0)
 #endif /* IGNORE_NULL_IDX_KEY */
 		return contents_empty;
@@ -2483,11 +2441,11 @@
 
 #ifdef IGNORE_NULL_IDX_KEY
 	next = NEXT_NODE(next);
-	number = BTR_get_quad(BTN_NUMBER(next));
+	number = get_long(BTN_NUMBER(next));
 	if (number == END_LEVEL || number == END_BUCKET)
 #else
 	node = NEXT_NODE(node);
-	number = BTR_get_quad(BTN_NUMBER(node));
+	number = get_long(BTN_NUMBER(node));
 	if (number < 0)
 #endif /* IGNORE_NULL_IDX_KEY */
 		return contents_single;
@@ -2545,7 +2503,7 @@
 		if (next == down)
 			if (page->btr_level) {
 				node = page->btr_nodes;
-				down = BTR_get_quad(BTN_NUMBER(node));
+				down = get_long(BTN_NUMBER(node));
 			}
 			else
 				down = 0;
@@ -3096,7 +3054,7 @@
 	prefix = (UCHAR) compute_prefix(key, BTN_DATA(node), BTN_LENGTH(node));
 	p = key->key_data + prefix;
 	key_end = key->key_data + key->key_length;
-	number = BTR_get_quad(BTN_NUMBER(node));
+	number = get_long(BTN_NUMBER(node));
 
 	if (number == END_LEVEL)
 		BUGCHECK(206);			/* msg 206 exceeded index level */
@@ -3113,7 +3071,7 @@
 
 		prior = node;
 		node = NEXT_NODE(node);
-		number = BTR_get_quad(BTN_NUMBER(node));
+		number = get_long(BTN_NUMBER(node));
 
 		/* If the page/record number is -1, the node is the last in the level
 		   and, by definition, is the target node.  Otherwise, if the
@@ -3319,7 +3277,7 @@
 	previous_number = 0;
 #endif
 	for (parent_node = parent_page->btr_nodes;;) {
-		number = BTR_get_quad(BTN_NUMBER(parent_node));
+		number = get_long(BTN_NUMBER(parent_node));
 
 		if (number == END_BUCKET) {
 			parent_page =
@@ -3383,10 +3341,10 @@
 #ifdef IGNORE_NULL_IDX_KEY
 	for (last_node =
 		 left_page->btr_nodes, number =
-		 BTR_get_quad(BTN_NUMBER(last_node)); (number != END_LEVEL)
+		 get_long(BTN_NUMBER(last_node)); (number != END_LEVEL)
 		 && (number != END_BUCKET);
 		 last_node =
-		 NEXT_NODE(last_node), number = BTR_get_quad(BTN_NUMBER(last_node))) {
+		 NEXT_NODE(last_node), number = get_long(BTN_NUMBER(last_node))) {
 		if (number == END_NON_NULL) {
 			/* this will help in negotiating for enough space later 
 			   This will make key_length calculation = 0; */
@@ -3404,7 +3362,7 @@
 	assert(number != END_NON_NULL);
 #else
 	for (last_node = left_page->btr_nodes;
-		 (number = BTR_get_quad(BTN_NUMBER(last_node))
+		 (number = get_long(BTN_NUMBER(last_node))
 		 >= 0); last_node = NEXT_NODE(last_node))
 		if ( (l = BTN_LENGTH(last_node)) ) {
 			p = last_key.key_data + BTN_PREFIX(last_node);
@@ -3448,7 +3406,7 @@
    order when two different processes split pages at the same time */
 
 		next_parent_node = NEXT_NODE(parent_node);
-		next_number = BTR_get_quad(BTN_NUMBER(next_parent_node));
+		next_number = get_long(BTN_NUMBER(next_parent_node));
 
 		if (
 			(left_page && previous_number
@@ -3592,7 +3550,7 @@
 		/* check whether it is empty */
 
 		parent_node = parent_page->btr_nodes;
-		number = BTR_get_quad(BTN_NUMBER(parent_node));
+		number = get_long(BTN_NUMBER(parent_node));
 #ifdef IGNORE_NULL_IDX_KEY
 		if (number == END_LEVEL || number == END_BUCKET)
 #else
@@ -3603,7 +3561,7 @@
 		/* check whether there is just one node */
 
 		parent_node = NEXT_NODE(parent_node);
-		number = BTR_get_quad(BTN_NUMBER(parent_node));
+		number = get_long(BTN_NUMBER(parent_node));
 #ifdef IGNORE_NULL_IDX_KEY
 		if (number == END_LEVEL || number == END_BUCKET)
 #else
@@ -3685,7 +3643,7 @@
 	for (;;) {
 		node_offset = (UCHAR *) node - (UCHAR *) bucket;
 
-		old_number = BTR_get_quad(BTN_NUMBER(node));
+		old_number = get_long(BTN_NUMBER(node));
 		old_prefix = BTN_PREFIX(node);
 		old_length = BTN_LENGTH(node);
 
@@ -3738,7 +3696,7 @@
 
 		while (old_number != insertion->iib_sibling) {
 			node = NEXT_NODE(node);
-			old_number = BTR_get_quad(BTN_NUMBER(node));
+			old_number = get_long(BTN_NUMBER(node));
 
 			if (BTN_LENGTH(node))
 				break;
@@ -3826,7 +3784,7 @@
 
 	if (insertion->iib_descriptor->idx_flags & idx_unique)
 		while (BTN_LENGTH(node) == 0 && BTN_PREFIX(node) == key->key_length) {
-			old_number = BTR_get_quad(BTN_NUMBER(node));
+			old_number = get_long(BTN_NUMBER(node));
 			if (old_number < 0)
 				break;
 			SBM_set(tdbb, &insertion->iib_duplicates, old_number);
@@ -3900,7 +3858,7 @@
 #ifdef IGNORE_NULL_IDX_KEY
 		/* We do not want END_NON_NULL marker as the first node in the split page.
 		 * Move one extra node down in the original bucket */
-		if (END_NON_NULL == BTR_get_quad(BTN_NUMBER(node))) {
+		if (END_NON_NULL == get_long(BTN_NUMBER(node))) {
 			/* assert: cannot have multiple END_NON_NULL markers */
 			assert(midpoint_is_end_non_null == FALSE);
 			midpoint_is_end_non_null = TRUE;
@@ -4239,7 +4197,7 @@
 	while (TRUE) {
 		node = find_node(page, insertion->iib_key, (USHORT)
 						 (idx->idx_flags & idx_descending));
-		number = BTR_get_quad(BTN_NUMBER(node));
+		number = get_long(BTN_NUMBER(node));
 
 		/* we should always find the node, but let's make sure */
 
@@ -4363,7 +4321,7 @@
 	while (TRUE) {
 		/* if we find the right one, quit */
 
-		number = BTR_get_quad(BTN_NUMBER(node));
+		number = get_long(BTN_NUMBER(node));
 		if (insertion->iib_number == number)
 			break;
 
@@ -4507,7 +4465,7 @@
 	flag &= ~irb_equality;
 
 	while (true) {
-		number = BTR_get_quad(BTN_NUMBER(node));
+		number = get_long(BTN_NUMBER(node));
 
 		if (number == END_LEVEL) {
 			return FALSE;

Index: nav.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/nav.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -U3 -r1.11 -r1.12
--- nav.cpp	5 Mar 2003 11:23:08 -0000	1.11
+++ nav.cpp	13 Aug 2003 10:45:10 -0000	1.12
@@ -23,6 +23,7 @@
 
 #include "firebird.h"
 #include <string.h>
+#include "memory_routines.h"
 #include "../jrd/jrd.h"
 #include "../jrd/ods.h"
 #include "../jrd/val.h"
@@ -564,8 +565,7 @@
 		node = next;
 		expanded_node = expanded_next;
 		if (node)
-			number =
-				BTR_get_quad(reinterpret_cast < char *>(BTN_NUMBER(node)));
+			number = get_long(BTN_NUMBER(node));
 		page = (BTR) window.win_buffer;
 
 #ifdef SCROLLABLE_CURSORS
@@ -1117,7 +1117,7 @@
    record which matches the passed dbkey */
 
 	for (;;) {
-		rpb->rpb_number = BTR_get_quad(BTN_NUMBER(node));
+		rpb->rpb_number = get_long(BTN_NUMBER(node));
 
 		/* if we find an index entry with the proper dbkey, try to fetch the record */
 
@@ -1255,7 +1255,7 @@
 
 	for (;;)
 	{
-		rpb->rpb_number = BTR_get_quad(BTN_NUMBER(node));
+		rpb->rpb_number = get_long(BTN_NUMBER(node));
 
 		/* if we have gone past the search key value, stop looking */
 
@@ -1414,8 +1414,7 @@
 	while (TRUE)
 		for (node = page->btr_nodes, end = LAST_NODE(page); node < end;
 			 node = NEXT_NODE(node)) {
-			number =
-				BTR_get_quad(reinterpret_cast < char *>(BTN_NUMBER(node)));
+			number = get_long(BTN_NUMBER(node));
 			if (number == END_LEVEL) {
 				*return_node = node;
 				return FALSE;
@@ -1830,8 +1829,7 @@
 		while (!(node = BTR_find_leaf(page, limit_ptr, impure->irsb_nav_data,
 									  0, idx->idx_flags & idx_descending,
 									  TRUE))
-			   || (BTR_get_quad(reinterpret_cast < char *>(BTN_NUMBER(node)))
-				   == END_BUCKET))
+			   || (static_cast<long>(get_long(BTN_NUMBER(node))) == END_BUCKET))
 			  page =
 				(BTR) CCH_HANDOFF(tdbb, window, page->btr_sibling, LCK_read,
 								  pag_index);

Index: val.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/val.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -b -U3 -r1.15 -r1.16
--- val.cpp	24 Mar 2003 14:41:42 -0000	1.15
+++ val.cpp	13 Aug 2003 10:45:10 -0000	1.16
@@ -540,6 +540,7 @@
 */
 
 #include "firebird.h"
+#include "memory_routines.h"
 #include "../jrd/ib_stdio.h"
 #include "../jrd/common.h"
 #include <stdarg.h>
@@ -1466,23 +1467,15 @@
 
 			/* Record the existance of a primary version of a record */
 			if (!page->btr_level && control
-				&& (control->vdr_flags & vdr_records)) SBM_set(tdbb,
-															   &control->
-															   vdr_idx_records,
-															   BTR_get_quad
-															   (reinterpret_cast
-																<
-																char
-																*>(BTN_NUMBER
-																   (node))));
+				&& (control->vdr_flags & vdr_records)) {
+			  SBM_set(tdbb, &control->vdr_idx_records, get_long(BTN_NUMBER(node)));
+		    }
 
 			/* fetch the next page down (if full validation was specified) */
 
 			if (page->btr_level && control
 				&& (control->vdr_flags & vdr_records)) {
-				down_number =
-					BTR_get_quad(reinterpret_cast <
-								 char *>(BTN_NUMBER(node)));
+				down_number = get_long(BTN_NUMBER(node));
 
 				/* Note: control == 0 for the fetch_page() call here 
 				   as we don't want to mark the page as visited yet - we'll 
@@ -1515,9 +1508,7 @@
 				if (previous_number != down_page->btr_left_sibling)
 					corrupt(tdbb, control, VAL_INDEX_PAGE_CORRUPT, relation,
 							id + 1, next);
-				next_number =
-					BTR_get_quad(reinterpret_cast <
-								 char *>(BTN_NUMBER((NEXT_NODE(node)))));
+				next_number = get_long(BTN_NUMBER((NEXT_NODE(node))));
 				if (next_number >= 0 && next_number != down_page->btr_sibling)
 					corrupt(tdbb, control, VAL_INDEX_PAGE_CORRUPT, relation,
 							id + 1, next);
@@ -1536,9 +1527,7 @@
 
 		if (next == down)
 			down =
-				(page->btr_level) ? BTR_get_quad(reinterpret_cast <
-												 char *>(page->btr_nodes[0].
-														 btn_number)) : 0;
+				(page->btr_level) ? get_long(page->btr_nodes[0].btn_number) : 0;
 
 		if (!(next = page->btr_sibling)) {
 			next = down;