firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 06:03:02 +01:00
Code Issues

Misc.

Browse Source
This commit is contained in:
asfernandes 2015-12-13 01:02:02 +00:00
parent 49a7242c29
commit 047175e1a5
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dsql/DdlNodes.epp
View File

@ -11651,7 +11651,7 @@ void AlterDatabaseNode::execute(thread_db* tdbb, DsqlCompilerScratch* dsqlScratc
END_FOR
// Allow update above to work as a lock, preventing altering of the database from parallel transactions
// Moreover, if should load crypt plugin if it (by a miracle) wasn't already loaded yet
// Moreover, it should load crypt plugin if it (by a miracle) wasn't already loaded yet
if (clauses & CLAUSE_CRYPT)
{
Database* const db = tdbb->getDatabase();

2
src/dsql/Parser.h
View File

@ -279,9 +279,11 @@ private:
{
using namespace Firebird;
if (clause & flag)
{
status_exception::raise(
Arg::Gds(isc_sqlerr) << Arg::Num(-637) <<
Arg::Gds(isc_dsql_duplicate_spec) << duplicateMsg);
}
clause |= flag;
}

8
src/jrd/CryptoManager.cpp
View File

@ -86,7 +86,7 @@ namespace {
// Fortunately, modern pages of size 4k and bigger can contain everything on one page.
bool searchEntry(UCHAR type, UCHAR& out_len, const UCHAR* &entry)
{
const UCHAR* end = ((const UCHAR*)header) + header->hdr_page_size;
const UCHAR* end = ((const UCHAR*) header) + header->hdr_page_size;
for (const UCHAR* p = header->hdr_data; (p < end - 2) && (*p != Ods::HDR_end); p += 2u + p[1])
{
if (*p == type)
@ -250,7 +250,7 @@ namespace Jrd {
else
{
if (!LCK_convert(tdbb, stateLock, CRYPT_NORMAL,
(flags & CRYPT_HDR_NOWAIT) ? LCK_NO_WAIT : LCK_WAIT))
(flags & CRYPT_HDR_NOWAIT) ? LCK_NO_WAIT : LCK_WAIT))
{
slowIO = LCK_read_data(tdbb, stateLock);
fb_assert(slowIO);
@ -401,7 +401,7 @@ namespace Jrd {
fb_assert(false);
lockAndReadHeader(tdbb);
}
catch(const Exception&)
catch (const Exception&)
{ }
}
throw;
@ -825,7 +825,7 @@ namespace Jrd {
Ods::pag* dest = page;
UCHAR savedFlags = page->pag_flags;
fb_assert ((!crypt) || cryptPlugin);
fb_assert((!crypt) || cryptPlugin);
if (crypt && Ods::pag_crypt_page[page->pag_type % (pag_max + 1)])
{
if (!cryptPlugin)

2
src/jrd/CryptoManager.h
View File

@ -190,7 +190,7 @@ public:
{
lockCond.wait(mutex);
}
catch(const Firebird::Exception&)
catch (const Firebird::Exception&)
{
--lockMode;
throw;

4
src/yvalve/preparse.cpp
View File

@ -201,7 +201,9 @@ bool PREPARSE_execute(CheckStatusWrapper* status, Why::YAttachment** ptrAtt,
SLONG page_size = 0;
bool matched;
do {
do
{
try
{
token = getToken(pos, tks);