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

12
manifest
View File

@ -1,5 +1,5 @@
C Update\smisc7.test\sto\saccount\sfor\sEQP\schanges. C Fix\sa\s(harmless)\svalgrind\swarning\sin\sthe\srtree\sextension.
D 2010-12-02T06:08:53 D 2010-12-02T11:24:58
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -80,7 +80,7 @@ F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
F ext/icu/icu.c 850e9a36567bbcce6bd85a4b68243cad8e3c2de2 F ext/icu/icu.c 850e9a36567bbcce6bd85a4b68243cad8e3c2de2
F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
F ext/rtree/rtree.c e1a2d0fd4b38200bf09d417e4c9400f62c981391 F ext/rtree/rtree.c 05b293c85403cf39bb5af0e7c010b0cafeab5e47
F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
F ext/rtree/rtree1.test dbd4250ac0ad367a262eb9676f7e3080b0368206 F ext/rtree/rtree1.test dbd4250ac0ad367a262eb9676f7e3080b0368206
F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@ -893,7 +893,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 6818c6e42faf233afa6b30799c5b425aa42d0783 P 917af565ac0c71c14fcba56632e687ed938a856c
R d27973dacf176c8c2e30469ec9d78ab2 R 43bbc2c83d0d7a219b1743fe660c6fcd
U dan U dan
Z 428e203c830e9dddb4981febf0a28597 Z 8d480d9e765294bce9f398dfb5ca2da5

2
manifest.uuid
View File

@ -1 +1 @@
917af565ac0c71c14fcba56632e687ed938a856c a94b9a395e0be9549d8c28e2b86b995c73c7b671