database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Change an unreachable branch into an assert().

Browse Source 
FossilOrigin-Name: fb076b28c36975ff2e41440f22fe5de115c195da
This commit is contained in:
drh
2015-03-25 18:29:10 +00:00
parent d2f83139f3
commit 606a357288
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sthe\ssaveCursorPosition()\sroutine\sin\sbtree.c\sso\sthat\sit\sworks\ncorrectly\sfor\sa\seState=CURSOR_SKIPNEXT\scursor. C Change\san\sunreachable\sbranch\sinto\san\sassert().
D 2015-03-25T17:35:01.825 D 2015-03-25T18:29:10.982
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -173,7 +173,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3 F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
F src/btree.c 933ab4ad883546193f5fd55f840299165adb8069 F src/btree.c 4f305e554d7d207375c3e29ab0335bd5a473a125
F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
F src/btreeInt.h 2bfefc01875d8da066504c233ec259fcb3b2ef72 F src/btreeInt.h 2bfefc01875d8da066504c233ec259fcb3b2ef72
F src/build.c 0419bba592c22f6d00e6d57a2ca7136720d02c1a F src/build.c 0419bba592c22f6d00e6d57a2ca7136720d02c1a
@@ -1247,7 +1247,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 1e96520ac1d12ca83f019a60482efa0a074f2f94 P 37866b4d483296ab9b7fcb9f5486695d4c2b8ddd
R 0d2b32f8ac05ffe0443a79d106bd4efe R 6f3611ab9d4988693f727ae20dc9c9e5
U drh U drh
Z 2f58ba8b67469927a3c7d533210b0ef3 Z 3f028f44e21ab0b1619e9687cba7cf7a

2
manifest.uuid
View File

@@ -1 +1 @@
37866b4d483296ab9b7fcb9f5486695d4c2b8ddd fb076b28c36975ff2e41440f22fe5de115c195da

3
src/btree.c
View File

@@ -815,9 +815,10 @@ int sqlite3BtreeCursorRestore(BtCursor *pCur, int *pDifferentRow){
*pDifferentRow = 1; *pDifferentRow = 1;
return rc; return rc;
} }
if( pCur->eState!=CURSOR_VALID || pCur->skipNext!=0 ){ if( pCur->eState!=CURSOR_VALID ){
*pDifferentRow = 1; *pDifferentRow = 1;
}else{ }else{
assert( pCur->skipNext==0 );
*pDifferentRow = 0; *pDifferentRow = 0;
} }
return SQLITE_OK; return SQLITE_OK;