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

Avoid variable shadowing

Browse Source
This commit is contained in:
brodsom 2004-08-24 23:11:02 +00:00
parent 09cca28836
commit 57528f8bc2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/classes/alloc.cpp
View File

@ -23,7 +23,7 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* $Id: alloc.cpp,v 1.62 2004-08-24 05:16:01 robocop Exp $
* $Id: alloc.cpp,v 1.63 2004-08-24 23:11:02 brodsom Exp $
*
*/
@ -1355,7 +1355,8 @@ void MemoryPool::removeFreeBlock(MemoryBlock *blk)
// mbk_prev_fragment to ZERO.
FreeMemoryBlock *fragmentToRemove = blockToPtr<FreeMemoryBlock*>(blk);
FreeMemoryBlock *prev = blk->mbk_prev_fragment, *next = fragmentToRemove->fbk_next_fragment;
FreeMemoryBlock *prev = blk->mbk_prev_fragment;
FreeMemoryBlock *next = fragmentToRemove->fbk_next_fragment;
if (prev) {
// Cheapest case. There is no need to touch B+ tree at all.
// Simply remove item from a middle or end of doubly linked list
@ -1391,12 +1392,12 @@ void MemoryPool::removeFreeBlock(MemoryBlock *blk)
else
{
while ( itr ) {
PendingFreeBlock *next = itr->next;
if (next==temp) {
PendingFreeBlock *next2 = itr->next;
if (next2==temp) {
itr->next = temp->next;
break;
}
itr = next;
itr = next2;
}
fb_assert(itr); // We had to find it somewhere
}