database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Fix a (harmless) valgrind warning in the rtree extension.

Browse Source 
FossilOrigin-Name: a94b9a395e0be9549d8c28e2b86b995c73c7b671
This commit is contained in:
dan
2010-12-02 11:24:58 +00:00
parent 659816e9c2
commit c79b6a8c51
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ext/rtree/rtree.c
View File

@ -893,6 +893,7 @@ static int testRtreeCell(Rtree *pRtree, RtreeCursor *pCursor, int *pbEof){
RtreeCell cell;
int ii;
int bRes = 0;
int rc = SQLITE_OK;
nodeGetCell(pRtree, pCursor->pNode, pCursor->iCell, &cell);
for(ii=0; bRes==0 && ii<pCursor->nConstraint; ii++){
@ -918,12 +919,8 @@ static int testRtreeCell(Rtree *pRtree, RtreeCursor *pCursor, int *pbEof){
break;
default: {
int rc;
assert( p->op==RTREE_MATCH );
rc = testRtreeGeom(pRtree, p, &cell, &bRes);
if( rc!=SQLITE_OK ){
return rc;
}
bRes = !bRes;
break;
}
@ -931,7 +928,7 @@ static int testRtreeCell(Rtree *pRtree, RtreeCursor *pCursor, int *pbEof){
}
*pbEof = bRes;
return SQLITE_OK;
return rc;
}
/*
@ -1014,14 +1011,13 @@ static int descendToCell(
rc = testRtreeCell(pRtree, pCursor, &isEof);
}
if( rc!=SQLITE_OK || isEof || iHeight==0 ){
*pEof = isEof;
return rc;
goto descend_to_cell_out;
}
iRowid = nodeGetRowid(pRtree, pCursor->pNode, pCursor->iCell);
rc = nodeAcquire(pRtree, iRowid, pCursor->pNode, &pChild);
if( rc!=SQLITE_OK ){
return rc;
goto descend_to_cell_out;
}
nodeRelease(pRtree, pCursor->pNode);
@ -1031,7 +1027,7 @@ static int descendToCell(
pCursor->iCell = ii;
rc = descendToCell(pRtree, pCursor, iHeight-1, &isEof);
if( rc!=SQLITE_OK ){
return rc;
goto descend_to_cell_out;
}
}
@ -1043,8 +1039,9 @@ static int descendToCell(
pCursor->iCell = iSavedCell;
}
descend_to_cell_out:
*pEof = isEof;
return SQLITE_OK;
return rc;
}
/*