database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-10 01:02:56 +03:00
Code Activity

Minor changes to remove a few MSVC compiler warnings at /W3. Ticket #3610. (CVS 6215)

Browse Source 
FossilOrigin-Name: c74c78e4eb7f6d674b7564b33387db996fbe5725
This commit is contained in:
shane
2009-01-30 05:40:27 +00:00
parent db15bcd550
commit d87897dfa2
7 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/pager.c
View File

@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
** @(#) $Id: pager.c,v 1.559 2009/01/24 11:30:43 drh Exp $
** @(#) $Id: pager.c,v 1.560 2009/01/30 05:40:27 shane Exp $
*/
#ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h"
@@ -2174,7 +2174,7 @@ static int pagerPlaybackSavepoint(Pager *pPager, PagerSavepoint *pSavepoint){
if( nJRec==0
&& pPager->journalHdr+JOURNAL_HDR_SZ(pPager)==pPager->journalOff
){
nJRec = (szJ - pPager->journalOff)/JOURNAL_PG_SZ(pPager);
nJRec = (u32)((szJ - pPager->journalOff)/JOURNAL_PG_SZ(pPager));
}
for(ii=0; rc==SQLITE_OK && ii<nJRec && pPager->journalOff<szJ; ii++){
rc = pager_playback_one_page(pPager, 1, &pPager->journalOff, 1, pDone);
@@ -2501,11 +2501,11 @@ int sqlite3PagerPagecount(Pager *pPager, int *pnPage){
if( n>0 && n<pPager->pageSize ){
nPage = 1;
}else{
nPage = n / pPager->pageSize;
nPage = (Pgno)(n / pPager->pageSize);
}
if( pPager->state!=PAGER_UNLOCK ){
pPager->dbSize = (Pgno)nPage;
pPager->dbFileSize = (Pgno)nPage;
pPager->dbSize = nPage;
pPager->dbFileSize = nPage;
pPager->dbSizeValid = 1;
}
}
@@ -3197,8 +3197,13 @@ int sqlite3PagerOpen(
*/
if( rc==SQLITE_OK && !readOnly ){
setSectorSize(pPager);
assert(SQLITE_DEFAULT_PAGE_SIZE<=SQLITE_MAX_DEFAULT_PAGE_SIZE);
if( szPageDflt<pPager->sectorSize ){
szPageDflt = pPager->sectorSize;
if( pPager->sectorSize>SQLITE_MAX_DEFAULT_PAGE_SIZE ){
szPageDflt = SQLITE_MAX_DEFAULT_PAGE_SIZE;
}else{
szPageDflt = (u16)pPager->sectorSize;
}
}
#ifdef SQLITE_ENABLE_ATOMIC_WRITE
{
@@ -3214,9 +3219,6 @@ int sqlite3PagerOpen(
}
}
#endif
if( szPageDflt>SQLITE_MAX_DEFAULT_PAGE_SIZE ){
szPageDflt = SQLITE_MAX_DEFAULT_PAGE_SIZE;
}
}
}else{
/* If a temporary file is requested, it is not opened immediately.