diff options
| author | drh <drh@noemail.net> | 2011-10-14 21:49:18 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2011-10-14 21:49:18 +0000 |
| commit | b07028f71cd96b48a81474c6f1eea9596eb41cc7 (patch) | |
| tree | 79e9ce2fc70ef9318d48c388431caf117fbdf001 /src/btree.c | |
| parent | 0edb7acd3c2dcd913e5cecce8475aed8ff0850bf (diff) | |
| download | sqlite-b07028f71cd96b48a81474c6f1eea9596eb41cc7.tar.gz sqlite-b07028f71cd96b48a81474c6f1eea9596eb41cc7.zip | |
Add assert() statements and eliminate needless variable assignments in order
to get the clang scan-build utility to report zero problems against the
SQLite core. Clang's static analysis did find one real problem - but it was
in the command-line shell, not in the SQLite core.
FossilOrigin-Name: 60fee9574b0125705787e33c16f116cf188c8323
Diffstat (limited to 'src/btree.c')
| -rw-r--r-- | src/btree.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/btree.c b/src/btree.c index f1a67cab9..6c724d0fa 100644 --- a/src/btree.c +++ b/src/btree.c @@ -4585,7 +4585,6 @@ int sqlite3BtreeMovetoUnpacked( if( c==0 ){ if( pPage->intKey && !pPage->leaf ){ lwr = idx; - upr = lwr - 1; break; }else{ *pRes = 0; @@ -4603,7 +4602,7 @@ int sqlite3BtreeMovetoUnpacked( } pCur->aiIdx[pCur->iPage] = (u16)(idx = (lwr+upr)/2); } - assert( lwr==upr+1 ); + assert( lwr==upr+1 || (pPage->intKey && !pPage->leaf) ); assert( pPage->isInit ); if( pPage->leaf ){ chldPg = 0; @@ -4868,6 +4867,8 @@ static int allocateBtreePage( pTrunk = 0; goto end_allocate_page; } + assert( pTrunk!=0 ); + assert( pTrunk->aData!=0 ); k = get4byte(&pTrunk->aData[4]); /* # of leaves on this trunk page */ if( k==0 && !searchList ){ @@ -6423,6 +6424,7 @@ static int balance_nonroot( /* Cell i is the cell immediately following the last cell on old ** sibling page j. If the siblings are not leaf pages of an ** intkey b-tree, then cell i was a divider cell. */ + assert( j+1 < ArraySize(apCopy) ); pOld = apCopy[++j]; iNextOld = i + !leafData + pOld->nCell + pOld->nOverflow; if( pOld->nOverflow ){ |