Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[58317] firebird/trunk
|
From: <asf...@us...> - 2013-07-06 23:11:16
|
Revision: 58317
http://sourceforge.net/p/firebird/code/58317
Author: asfernandes
Date: 2013-07-06 23:11:13 +0000 (Sat, 06 Jul 2013)
Log Message:
-----------
Misc.
Modified Paths:
--------------
firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss
firebird/trunk/src/jrd/Database.cpp
firebird/trunk/src/jrd/cch.cpp
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/opt.cpp
Modified: firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss 2013-07-06 01:01:14 UTC (rev 58316)
+++ firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss 2013-07-06 23:11:13 UTC (rev 58317)
@@ -874,7 +874,7 @@
SvcParams := ServerType + SvcParams;
if IsComponentSelected('ServerComponent') and IsTaskSelected('UseSuperServerTask\UseGuardianTask') then
- SvcParams := ServerType + SvcParams + ' -guardian ';
+ SvcParams := ServerType + SvcParams + ' -guardian ';
InstanceName := ServiceName('We currently do not support or test for a different instance name');
@@ -1001,7 +1001,7 @@
ReplaceLine(GetAppPath+'\firebird.conf','AuthServer = ','AuthServer = Srp, Win_Sspi, Legacy_Auth','#');
end;
- end;
+ end;
end;
end;
Modified: firebird/trunk/src/jrd/Database.cpp
===================================================================
--- firebird/trunk/src/jrd/Database.cpp 2013-07-06 01:01:14 UTC (rev 58316)
+++ firebird/trunk/src/jrd/Database.cpp 2013-07-06 23:11:13 UTC (rev 58317)
@@ -125,7 +125,7 @@
Database* dbb = static_cast<Database*>(ast_object);
AsyncContextHolder tdbb(dbb, FB_FUNCTION);
- if (dbb->dbb_flags & DBB_sweep_starting && !(dbb->dbb_flags & DBB_sweep_in_progress))
+ if ((dbb->dbb_flags & DBB_sweep_starting) && !(dbb->dbb_flags & DBB_sweep_in_progress))
{
dbb->dbb_flags &= ~DBB_sweep_starting;
LCK_release(tdbb, dbb->dbb_sweep_lock);
@@ -136,7 +136,7 @@
Lock* Database::createSweepLock(thread_db* tdbb)
{
- if (!dbb_sweep_lock)
+ if (!dbb_sweep_lock)
{
dbb_sweep_lock = FB_NEW_RPT(*dbb_permanent, 0) Lock(tdbb, 0, LCK_sweep);
dbb_sweep_lock->lck_ast = blocking_ast_sweep;
@@ -189,7 +189,7 @@
while (true)
{
AtomicCounter::counter_type old = dbb_flags;
- if ((old & (DBB_sweep_in_progress)) || (dbb_ast_flags & DBB_shutdown))
+ if ((old & DBB_sweep_in_progress) || (dbb_ast_flags & DBB_shutdown))
return false;
if (dbb_flags.compareExchange(old, old | DBB_sweep_in_progress))
@@ -209,9 +209,7 @@
}
}
else
- {
dbb_flags &= ~DBB_sweep_starting;
- }
return true;
}
@@ -221,9 +219,9 @@
if (!(dbb_flags & (DBB_sweep_starting | DBB_sweep_in_progress)))
return;
- if (dbb_sweep_lock) {
+ if (dbb_sweep_lock)
LCK_release(tdbb, dbb_sweep_lock);
- }
+
dbb_flags &= ~(DBB_sweep_in_progress | DBB_sweep_starting);
}
Modified: firebird/trunk/src/jrd/cch.cpp
===================================================================
--- firebird/trunk/src/jrd/cch.cpp 2013-07-06 01:01:14 UTC (rev 58316)
+++ firebird/trunk/src/jrd/cch.cpp 2013-07-06 23:11:13 UTC (rev 58317)
@@ -2771,7 +2771,7 @@
}
}
- // release lock before loosing control over bdb, it prevents
+ // release lock before loosing control over bdb, it prevents
// concurrent operations on released lock
if (release_flag)
{
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2013-07-06 01:01:14 UTC (rev 58316)
+++ firebird/trunk/src/jrd/jrd.cpp 2013-07-06 23:11:13 UTC (rev 58317)
@@ -1622,22 +1622,19 @@
if (options.dpb_verify)
{
validateAccess(attachment);
- if (!CCH_exclusive(tdbb, LCK_PW, WAIT_PERIOD, NULL)) {
+ if (!CCH_exclusive(tdbb, LCK_PW, WAIT_PERIOD, NULL))
ERR_post(Arg::Gds(isc_bad_dpb_content) << Arg::Gds(isc_cant_validate));
- }
// Can't allow garbage collection during database validation.
VIO_fini(tdbb);
- if (!VAL_validate(tdbb, options.dpb_verify)) {
+ if (!VAL_validate(tdbb, options.dpb_verify))
ERR_punt();
- }
}
- if (options.dpb_journal.hasData()) {
+ if (options.dpb_journal.hasData())
ERR_post(Arg::Gds(isc_bad_dpb_content) << Arg::Gds(isc_cant_start_journal));
- }
if (options.dpb_wal_action)
{
@@ -1685,13 +1682,10 @@
if (options.dpb_set_page_buffers)
{
if (dbb->dbb_config->getSharedCache())
- {
validateAccess(attachment);
- }
+
if (attachment->locksmith())
- {
PAG_set_page_buffers(tdbb, options.dpb_page_buffers);
- }
}
if (options.dpb_set_db_readonly)
@@ -1727,9 +1721,8 @@
dbb->dbb_crypto_manager->startCryptThread(tdbb);
- if (options.dpb_dbkey_scope) {
+ if (options.dpb_dbkey_scope)
attachment->att_dbkey_trans = TRA_start(tdbb, 0, 0);
- }
if (!(attachment->att_flags & ATT_no_db_triggers))
{
@@ -1790,7 +1783,7 @@
if (traceManager->needs(TRACE_EVENT_ERROR))
traceManager->event_error(&conn, &traceStatus, "JProvider::attachDatabase");
- if (traceManager->needs(TRACE_EVENT_DETACH))
+ if (traceManager->needs(TRACE_EVENT_DETACH))
traceManager->event_detach(&conn, false);
}
else
Modified: firebird/trunk/src/jrd/opt.cpp
===================================================================
--- firebird/trunk/src/jrd/opt.cpp 2013-07-06 01:01:14 UTC (rev 58316)
+++ firebird/trunk/src/jrd/opt.cpp 2013-07-06 23:11:13 UTC (rev 58317)
@@ -2295,7 +2295,7 @@
// Persistent table
OptimizerRetrieval optimizerRetrieval(*tdbb->getDefaultPool(), opt, stream,
outer_flag, inner_flag,
- sort_ptr ? *sort_ptr : NULL);
+ (sort_ptr ? *sort_ptr : NULL));
AutoPtr<InversionCandidate> candidate(optimizerRetrieval.getInversion());
if (candidate)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
