mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-23 14:03:07 +01:00
Small cleanup.
This commit is contained in:
parent
9f3636f9df
commit
c17f3cc0df
@ -24,7 +24,7 @@
|
||||
*
|
||||
*/
|
||||
/*
|
||||
$Id: btr.cpp,v 1.30 2003-05-05 14:25:40 dimitr Exp $
|
||||
$Id: btr.cpp,v 1.31 2003-05-26 15:46:20 dimitr Exp $
|
||||
*/
|
||||
|
||||
#include "firebird.h"
|
||||
@ -66,7 +66,6 @@ $Id: btr.cpp,v 1.30 2003-05-05 14:25:40 dimitr Exp $
|
||||
#include "../jrd/thd_proto.h"
|
||||
#include "../jrd/tra_proto.h"
|
||||
|
||||
|
||||
extern "C" {
|
||||
|
||||
|
||||
@ -4388,13 +4387,10 @@ static CONTENTS remove_leaf_node(TDBB tdbb, IIB * insertion, WIN * window)
|
||||
* Just check whether the next node has any BTN_LENGTH. If it does,
|
||||
* then it is not a duplicate */
|
||||
node = NEXT_NODE(node);
|
||||
if (BTN_LENGTH(node)
|
||||
!= 0)
|
||||
if (BTN_LENGTH(node) != 0)
|
||||
#else
|
||||
node = (BTN) (BTN_DATA(node) + BTN_LENGTH(node));
|
||||
if (BTN_LENGTH(node)
|
||||
!= 0 || BTN_PREFIX(node)
|
||||
!= key->key_length)
|
||||
if (BTN_LENGTH(node) != 0 || BTN_PREFIX(node) != key->key_length)
|
||||
#endif /* IGNORE_NULL_IDX_KEY */
|
||||
{
|
||||
#ifdef DEBUG_BTR
|
||||
@ -4411,8 +4407,7 @@ static CONTENTS remove_leaf_node(TDBB tdbb, IIB * insertion, WIN * window)
|
||||
|
||||
++pages;
|
||||
page = (BTR)
|
||||
CCH_HANDOFF(tdbb,
|
||||
window, page->btr_sibling, LCK_write, pag_index);
|
||||
CCH_HANDOFF(tdbb, window, page->btr_sibling, LCK_write, pag_index);
|
||||
node = page->btr_nodes;
|
||||
if ((l = BTN_LENGTH(node))
|
||||
!= key->key_length) {
|
||||
|
Loading…
Reference in New Issue
Block a user