From fea56bf0581ccd3138302bc01be339a3c26b2dbf Mon Sep 17 00:00:00 2001 From: asfernandes Date: Thu, 6 Aug 2009 01:06:05 +0000 Subject: [PATCH] Misc --- doc/README.build.posix.html | 9 +++------ src/common/StatusArg.h | 4 ++++ src/common/classes/ClumpletReader.cpp | 2 +- src/dsql/dsql.cpp | 2 +- src/gpre/fbrmclib.cpp | 2 +- src/gpre/rmc.cpp | 1 - src/jrd/jrd_proto.h | 1 - 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/doc/README.build.posix.html b/doc/README.build.posix.html index 150a72c2b6..777f4b75bb 100644 --- a/doc/README.build.posix.html +++ b/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.

-

Autogen.sh depends on the GNU toolchain to create "configure." +

Autogen.sh depends on the GNU toolchain to create "configure". 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.

-

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 +

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.

diff --git a/src/common/StatusArg.h b/src/common/StatusArg.h index a852e37a44..72c41e0fdc 100644 --- a/src/common/StatusArg.h +++ b/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); diff --git a/src/common/classes/ClumpletReader.cpp b/src/common/classes/ClumpletReader.cpp index f7a1308f94..ffe8707e88 100644 --- a/src/common/classes/ClumpletReader.cpp +++ b/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; diff --git a/src/dsql/dsql.cpp b/src/dsql/dsql.cpp index 436133cd90..a8cc4cb976 100644 --- a/src/dsql/dsql.cpp +++ b/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 diff --git a/src/gpre/fbrmclib.cpp b/src/gpre/fbrmclib.cpp index c8f8f23c96..c44825603f 100644 --- a/src/gpre/fbrmclib.cpp +++ b/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++; diff --git a/src/gpre/rmc.cpp b/src/gpre/rmc.cpp index 3a331a3d27..8f7cf48f32 100644 --- a/src/gpre/rmc.cpp +++ b/src/gpre/rmc.cpp @@ -4506,4 +4506,3 @@ static void t_start_auto(const gpre_req* request, set_sqlcode(action); } - diff --git a/src/jrd/jrd_proto.h b/src/jrd/jrd_proto.h index 8db0d9dfc2..7598e54411 100644 --- a/src/jrd/jrd_proto.h +++ b/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 */ -