database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00
Code Activity

Remove unreachable condition from rtree.c.

Browse Source 
FossilOrigin-Name: 90f40cd36860d3af13ec24575dff7cc1f57ac493
This commit is contained in:
dan
2010-08-26 11:27:22 +00:00
parent 2bf19178f7
commit c23454023e
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ext/rtree/rtree.c
View File

@ -2162,6 +2162,7 @@ static void fixBoundingBox(Rtree *pRtree, RtreeNode *pNode){
** cell, adjust the r-tree data structure if required.
*/
static int deleteCell(Rtree *pRtree, RtreeNode *pNode, int iCell, int iHeight){
RtreeNode *pParent;
int rc;
if( SQLITE_OK!=(rc = fixLeafParent(pRtree, pNode)) ){
@ -2178,11 +2179,10 @@ static int deleteCell(Rtree *pRtree, RtreeNode *pNode, int iCell, int iHeight){
** cell in the parent node so that it tightly contains the updated
** node.
*/
if( pNode->iNode!=1 ){
RtreeNode *pParent = pNode->pParent;
if( (pParent->iNode!=1 || NCELL(pParent)!=1)
&& (NCELL(pNode)<RTREE_MINCELLS(pRtree))
){
pParent = pNode->pParent;
assert( pParent || pNode->iNode==1 );
if( pParent ){
if( NCELL(pNode)<RTREE_MINCELLS(pRtree) ){
rc = removeNode(pRtree, pNode, iHeight);
}else{
fixBoundingBox(pRtree, pNode);