Change sqlite3PagerPagecount() to return void, since the return value was

always SQLITE_OK and was never used.

FossilOrigin-Name: 7dd78eb7974ec7c40af3fcf2b125ca5bc0766b5c
This commit is contained in:
drh
2010-08-14 17:12:04 +00:00
parent 5d433ce2ab
commit 8fb8b53728
5 changed files with 15 additions and 18 deletions
+1 -3
View File
@@ -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;
}
+1 -2
View File
@@ -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;
}
+1 -1
View File
@@ -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*);