diff options
| author | drh <drh@noemail.net> | 2010-04-02 03:38:59 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2010-04-02 03:38:59 +0000 |
| commit | cce75d3343cb1eb1b243fc6055f6a2b5568c6b4b (patch) | |
| tree | fa36630fa6e2b4b3c43977d0abe93871ced42111 /src | |
| parent | 4d077f9255089380dfddbce7e2d944c141af52c6 (diff) | |
| download | sqlite-cce75d3343cb1eb1b243fc6055f6a2b5568c6b4b.tar.gz sqlite-cce75d3343cb1eb1b243fc6055f6a2b5568c6b4b.zip | |
Pager changes for code coverage testing.
FossilOrigin-Name: b04a45ea9714e7a35372b5d6a58868b307d10502
Diffstat (limited to 'src')
| -rw-r--r-- | src/pager.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/pager.c b/src/pager.c index 10efe0291..639c90026 100644 --- a/src/pager.c +++ b/src/pager.c @@ -2462,11 +2462,6 @@ int sqlite3PagerReadFileheader(Pager *pPager, int N, unsigned char *pDest){ int sqlite3PagerPagecount(Pager *pPager, int *pnPage){ Pgno nPage; /* Value to return via *pnPage */ - /* If the pager is already in the error state, return the error code. */ - if( pPager->errCode ){ - return pPager->errCode; - } - /* Determine the number of pages in the file. Store this in nPage. */ if( pPager->dbSizeValid ){ nPage = pPager->dbSize; @@ -4158,7 +4153,7 @@ static int pager_write(PgHdr *pPg){ /* If an error has been previously detected, report the same error ** again. */ - if( pPager->errCode ) return pPager->errCode; + if( NEVER(pPager->errCode) ) return pPager->errCode; /* Higher-level routines never call this function if database is not ** writable. But check anyway, just for robustness. */ @@ -4565,7 +4560,7 @@ int sqlite3PagerCommitPhaseOne( assert( pPager->journalMode!=PAGER_JOURNALMODE_OFF || pPager->dbOrigSize==0 ); /* If a prior error occurred, report that error again. */ - if( pPager->errCode ) return pPager->errCode; + if( NEVER(pPager->errCode) ) return pPager->errCode; PAGERTRACE(("DATABASE SYNC: File=%s zMaster=%s nSize=%d\n", pPager->zFilename, zMaster, pPager->dbSize)); |