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

Warnings

Browse Source
This commit is contained in:
hvlad 2011-02-01 15:17:49 +00:00
parent 4b638d6e28
commit 3db1dd93c8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lock/lock.cpp
View File

@ -3593,9 +3593,9 @@ void LockManager::validate_lock(const SRQ_PTR lock_ptr, USHORT freed, const SRQ_
direct_counts[request->lrq_state]++; direct_counts[request->lrq_state]++;
} }
if ((freed == EXPECT_inuse) && (lrq_ptr != 0)) if ((freed == EXPECT_inuse) && (lrq_ptr != 0)) {
CHECK(found == 1); // request is in lock's queue CHECK(found == 1); // request is in lock's queue
}
if (freed == EXPECT_inuse) if (freed == EXPECT_inuse)
{ {
@ -3799,8 +3799,9 @@ void LockManager::validate_request(const SRQ_PTR lrq_ptr, USHORT freed, USHORT r
CHECK(!(request->lrq_flags & (LRQ_converting | LRQ_timed_out))); CHECK(!(request->lrq_flags & (LRQ_converting | LRQ_timed_out)));
// Once a request is rejected, it CAN'T be pending any longer // Once a request is rejected, it CAN'T be pending any longer
if (request->lrq_flags & LRQ_rejected) if (request->lrq_flags & LRQ_rejected) {
CHECK(!(request->lrq_flags & LRQ_pending)); CHECK(!(request->lrq_flags & LRQ_pending));
}
// Can't both be scanned & marked for deadlock walk // Can't both be scanned & marked for deadlock walk
CHECK((request->lrq_flags & (LRQ_deadlock | LRQ_scanned)) != (LRQ_deadlock | LRQ_scanned)); CHECK((request->lrq_flags & (LRQ_deadlock | LRQ_scanned)) != (LRQ_deadlock | LRQ_scanned));