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

Simplification to the progress callback check. On branch removed.

Browse Source 
FossilOrigin-Name: 24ef16548eebcdb9d8b40308f6a16dabf8f8d474
This commit is contained in:
drh
2013-11-14 00:09:48 +00:00
parent e6400b9901
commit 400fcbad71
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vdbe.c
View File

@@ -755,15 +755,12 @@ check_for_interrupt:
** a return code SQLITE_ABORT.
*/
if( db->xProgress!=0 && nVmStep>=nProgressLimit ){
int prc;
prc = db->xProgress(db->pProgressArg);
if( prc!=0 ){
assert( db->nProgressOps!=0 );
nProgressLimit = nVmStep + db->nProgressOps - (nVmStep%db->nProgressOps);
if( db->xProgress(db->pProgressArg) ){
rc = SQLITE_INTERRUPT;
goto vdbe_error_halt;
}
if( db->xProgress!=0 ){
nProgressLimit = nVmStep + db->nProgressOps - (nVmStep%db->nProgressOps);
}
}
#endif