diff --git a/manifest b/manifest index d92ec80d5b..b228c045be 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sbunch\sof\sharmless\swarnings.\s(CVS\s1749) -D 2004-06-28T01:11:46 +C A\sfew\smore\swarning\sfixes.\s(CVS\s1750) +D 2004-06-28T01:16:46 F Makefile.in cb7a9889c38723f72b2506c4236ff30a05ff172b F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -50,7 +50,7 @@ F src/os_unix.c bd62e20d3abfb96c41fe737715b328d1dbb52bf7 F src/os_unix.h 00c1f82b526ab2fb7ee5ddd555ea4ed68363c93a F src/os_win.c 84549f6cc815237533c5d0eb3697352b03478d96 F src/os_win.h babd4e912967c6b09088cfe38a45e8005a07ba44 -F src/pager.c 6240557abedaf6d888359a2365df45bce414c540 +F src/pager.c 1156c264f314142fd73eedf5ad27e42b279227b0 F src/pager.h fe818866f6d1adcffeed88705e8df7e588cbaf13 F src/parse.y e19e066e726a31d7b2d3e6475bdf55f7e339f8a3 F src/pragma.c 2ca5ef7e27916f191a3b1201ad576ef6f8a8d72d @@ -229,7 +229,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9 F www/version3.tcl 563ba3ac02f64da27ab17f3edbe8e56bfd0293fb F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P e28d42cb5e274b871f54add0e046d6e153060e21 -R 66a75445f0f574c8e7b5d4ad10988339 +P fae7c6e004aa4752fd3db09a42bfdb900861b3c0 +R a3cbd2e575e2da580062b00616263b99 U danielk1977 -Z e6fa8ff2dabd246e980e0df72da05b85 +Z 263ce207f2792f2dd2bd1a2e796f4361 diff --git a/manifest.uuid b/manifest.uuid index 3e9fc8ba94..987517240c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fae7c6e004aa4752fd3db09a42bfdb900861b3c0 \ No newline at end of file +81e4994045697470bcfd692a794731c8291a8a30 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index ac161d904a..26878012f7 100644 --- a/src/pager.c +++ b/src/pager.c @@ -18,7 +18,7 @@ ** file simultaneously, or one process from reading the database while ** another is writing. ** -** @(#) $Id: pager.c,v 1.145 2004/06/26 13:51:34 danielk1977 Exp $ +** @(#) $Id: pager.c,v 1.146 2004/06/28 01:16:46 danielk1977 Exp $ */ #include "os.h" /* Must be first to enable large file support */ #include "sqliteInt.h" @@ -403,7 +403,7 @@ static int readMasterJournal(OsFile *pJrnl, char **pzMaster){ int rc; u32 len; off_t szJ; - int cksum; + u32 cksum; int i; unsigned char aMagic[8]; /* A buffer to hold the magic header */ @@ -595,7 +595,7 @@ static int readJournalHdr( ** is being called from within pager_playback(). The local value ** of Pager.sectorSize is restored at the end of that routine. */ - rc = read32bits(&pPager->jfd, &pPager->sectorSize); + rc = read32bits(&pPager->jfd, (u32 *)&pPager->sectorSize); if( rc ) return rc; pPager->journalOff += JOURNAL_HDR_SZ(pPager); @@ -624,7 +624,7 @@ static int writeMasterJournal(Pager *pPager, const char *zMaster){ int rc; int len; int i; - int cksum = 0; + u32 cksum = 0; if( !zMaster || pPager->setMaster) return SQLITE_OK; pPager->setMaster = 1; @@ -1069,7 +1069,7 @@ static int pager_reload_cache(Pager *pPager){ */ static int pager_playback(Pager *pPager){ off_t szJ; /* Size of the journal file in bytes */ - int nRec; /* Number of Records in the journal */ + u32 nRec; /* Number of Records in the journal */ int i; /* Loop counter */ Pgno mxPg = 0; /* Size of the original file in pages */ int rc; /* Result code of a subroutine */