diff options
| author | drh <drh@noemail.net> | 2010-04-29 22:34:07 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2010-04-29 22:34:07 +0000 |
| commit | 7ed91f2344f1cb6837e1fba1b83fba5b6ddce887 (patch) | |
| tree | d8c391a5c11dcc10cf6e142e404ae8ad5b2d89d1 /src/vdbeapi.c | |
| parent | 31cbbbad1ccf37ad2f83daf2b34416e643f75d3e (diff) | |
| download | sqlite-7ed91f2344f1cb6837e1fba1b83fba5b6ddce887.tar.gz sqlite-7ed91f2344f1cb6837e1fba1b83fba5b6ddce887.zip | |
Refactor wal.c to use the VFS. This check-in compiles and links and works
ok as long as you leave WAL turned off, but WAL does not work.
FossilOrigin-Name: 62db5fa3b61be885b2d94e9b9ce3877b2c588350
Diffstat (limited to 'src/vdbeapi.c')
| -rw-r--r-- | src/vdbeapi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vdbeapi.c b/src/vdbeapi.c index 1c938ee5d..12100ce56 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -306,15 +306,15 @@ void sqlite3_result_error_nomem(sqlite3_context *pCtx){ pCtx->s.db->mallocFailed = 1; } -static int doLogCallbacks(sqlite3 *db){ +static int doWalCallbacks(sqlite3 *db){ int i; int rc = SQLITE_OK; for(i=0; i<db->nDb; i++){ Btree *pBt = db->aDb[i].pBt; if( pBt ){ - int nEntry = sqlite3PagerLogCallback(sqlite3BtreePager(pBt)); - if( db->xLogCallback && nEntry>0 && rc==SQLITE_OK - && db->xLogCallback(db->pLogArg, db, db->aDb[i].zName, nEntry) + int nEntry = sqlite3PagerWalCallback(sqlite3BtreePager(pBt)); + if( db->xWalCallback && nEntry>0 && rc==SQLITE_OK + && db->xWalCallback(db->pWalArg, db, db->aDb[i].zName, nEntry) ){ rc = sqlite3PagerCheckpoint(sqlite3BtreePager(pBt)); } @@ -406,7 +406,7 @@ static int sqlite3Step(Vdbe *p){ if( rc==SQLITE_DONE ){ assert( p->rc==SQLITE_OK ); - p->rc = doLogCallbacks(db); + p->rc = doWalCallbacks(db); if( p->rc!=SQLITE_OK ){ rc = SQLITE_ERROR; } |