diff options
author | drh <drh@noemail.net> | 2010-08-14 17:12:04 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2010-08-14 17:12:04 +0000 |
commit | 8fb8b53728640238e9b4e56a6f02ac21ca2fdca2 (patch) | |
tree | bcdc3c4d232d369aa7e2f7b5764dcb1ad2590e43 /src | |
parent | 5d433ce2ab4fd9f22a8c4f3da3c76c233dd2cb7f (diff) | |
download | sqlite-8fb8b53728640238e9b4e56a6f02ac21ca2fdca2.tar.gz sqlite-8fb8b53728640238e9b4e56a6f02ac21ca2fdca2.zip |
Change sqlite3PagerPagecount() to return void, since the return value was
always SQLITE_OK and was never used.
FossilOrigin-Name: 7dd78eb7974ec7c40af3fcf2b125ca5bc0766b5c
Diffstat (limited to 'src')
-rw-r--r-- | src/btree.c | 4 | ||||
-rw-r--r-- | src/pager.c | 3 | ||||
-rw-r--r-- | src/pager.h | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/btree.c b/src/btree.c index 9ccf5500e..b90128eba 100644 --- a/src/btree.c +++ b/src/btree.c @@ -2260,9 +2260,7 @@ static int lockBtree(BtShared *pBt){ ** a valid database file. */ nPage = nPageHeader = get4byte(28+(u8*)pPage1->aData); - if( (rc = sqlite3PagerPagecount(pBt->pPager, &nPageFile))!=SQLITE_OK ){; - goto page1_init_failed; - } + sqlite3PagerPagecount(pBt->pPager, &nPageFile); if( nPage==0 || memcmp(24+(u8*)pPage1->aData, 92+(u8*)pPage1->aData,4)!=0 ){ nPage = nPageFile; } diff --git a/src/pager.c b/src/pager.c index 102cbfd82..9935e2355 100644 --- a/src/pager.c +++ b/src/pager.c @@ -3505,11 +3505,10 @@ int sqlite3PagerReadFileheader(Pager *pPager, int N, unsigned char *pDest){ ** However, if the file is between 1 and <page-size> bytes in size, then ** this is considered a 1 page file. */ -int sqlite3PagerPagecount(Pager *pPager, int *pnPage){ +void sqlite3PagerPagecount(Pager *pPager, int *pnPage){ assert( pPager->eState>=PAGER_READER ); assert( pPager->eState!=PAGER_WRITER_FINISHED ); *pnPage = (int)pPager->dbSize; - return SQLITE_OK; } diff --git a/src/pager.h b/src/pager.h index ad9144aec..0f100d5cd 100644 --- a/src/pager.h +++ b/src/pager.h @@ -126,7 +126,7 @@ void *sqlite3PagerGetData(DbPage *); void *sqlite3PagerGetExtra(DbPage *); /* Functions used to manage pager transactions and savepoints. */ -int sqlite3PagerPagecount(Pager*, int*); +void sqlite3PagerPagecount(Pager*, int*); int sqlite3PagerBegin(Pager*, int exFlag, int); int sqlite3PagerCommitPhaseOne(Pager*,const char *zMaster, int); int sqlite3PagerExclusiveLock(Pager*); |