Misc

doc/README.build.posix.html

@@ -72,17 +72,14 @@ script is generated by running the "autogen.sh" script.
 Autogen.sh is a shell script located in the root directory of the
 Firebird build. 
 </P>
-<P>Autogen.sh depends on the GNU toolchain to create &quot;configure.&quot;
+<P>Autogen.sh depends on the GNU toolchain to create &quot;configure&quot;.
 Modern LINUX distributions will already have the GNU toolchain
 installed, but if you are attempting a build on a different POSIX
 system, such as AIX, HP-UX, or Solaris, you may need to install the
 necessary GNU utilities. 
 </P>
-<P>The table below shows the versions of the GNU tools used to build
-Firebird 2.5 on the UNIX hosts. These versions of the GNU tools are
-what we use to build Firebird 2.5 on the different POSIX hosts. These
-versions of the GNU tools are what we use to build Firebird 2.5 on
-the different POSIX hosts. We take measures to make configure
+<P>The table below shows the versions of the GNU tools that we use to build
+Firebird 2.5 on the different POSIX hosts. We take measures to make configure
 buildable with as wide range of autotools as possible, but we can't
 check all possible combinations.</P>
 <DL>

src/common/StatusArg.h

@@ -143,23 +143,27 @@ public:
 		implementation->shiftLeft(arg);
 		return *this;
 	}
+
 	// warning special case - to setup first warning location
 	StatusVector& operator<<(const Warning& arg) throw()
 	{
 		implementation->shiftLeft(arg);
 		return *this;
 	}
+
 	// Str special case - make the code simpler & better readable
 	StatusVector& operator<<(const char* text) throw()
 	{
 		implementation->shiftLeft(text);
 		return *this;
 	}
+
 	StatusVector& operator<<(const AbstractString& text) throw()
 	{
 		implementation->shiftLeft(text);
 		return *this;
 	}
+
 	StatusVector& operator<<(const MetaName& text) throw()
 	{
 		implementation->shiftLeft(text);

src/common/classes/ClumpletReader.cpp

@@ -546,7 +546,7 @@ const UCHAR* ClumpletReader::getBytes() const
 SINT64 ClumpletReader::fromVaxInteger(const UCHAR* ptr, size_t length)
 {
 	// We can't handle numbers bigger than int64. Some cases use length == 0.
-	fb_assert(ptr && length >= 0 && length < 9); 
+	fb_assert(ptr && length >= 0 && length < 9);
 	// This code is taken from gds__vax_integer
 	SINT64 value = 0;
 	int shift = 0;

src/dsql/dsql.cpp

@@ -2647,7 +2647,7 @@ static dsql_req* prepare(thread_db* tdbb, dsql_dbb* database, jrd_tra* transacti
 		statement->req_flags |= REQ_blr_version4;
 
 	GEN_request(statement, node);
-	const ULONG length = statement->req_blr_data.getCount();
+	const ULONG length = (ULONG) statement->req_blr_data.getCount();
 
 	// stop here for ddl statements
 

src/gpre/fbrmclib.cpp

@@ -307,7 +307,7 @@ static ISC_UINT64 atoi64(const char *s)
 	while (*s)
 	{
 		if ((*s >= '0') && (*s <= '9'))
-			rslt = (rslt * 10) + *s - '0';
+			rslt = (rslt * 10) + (*s - '0');
 		else
 			return (0);
 		s++;

src/gpre/rmc.cpp

@@ -4506,4 +4506,3 @@ static void t_start_auto(const gpre_req* request,
 
 	set_sqlcode(action);
 }
-

src/jrd/jrd_proto.h

@@ -165,4 +165,3 @@ void JRD_compile(Jrd::thread_db* tdbb, Jrd::Attachment* attachment, Jrd::jrd_req
 bool JRD_verify_database_access(const Firebird::PathName&);
 
 #endif /* JRD_JRD_PROTO_H */
-