diff options
Diffstat (limited to 'src/pager.c')
| -rw-r--r-- | src/pager.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pager.c b/src/pager.c index 302a036ad..e26a40268 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.563 2009/02/03 22:51:06 drh Exp $ +** @(#) $Id: pager.c,v 1.564 2009/02/04 01:49:30 shane Exp $ */ #ifndef SQLITE_OMIT_DISKIO #include "sqliteInt.h" @@ -993,11 +993,11 @@ static int writeMasterJournal(Pager *pPager, const char *zMaster){ /* Write the master journal data to the end of the journal file. If ** an error occurs, return the error code to the caller. */ - if( (rc = write32bits(pPager->jfd, iHdrOff, PAGER_MJ_PGNO(pPager))) - || (rc = sqlite3OsWrite(pPager->jfd, zMaster, nMaster, iHdrOff+4)) - || (rc = write32bits(pPager->jfd, iHdrOff+4+nMaster, nMaster)) - || (rc = write32bits(pPager->jfd, iHdrOff+4+nMaster+4, cksum)) - || (rc = sqlite3OsWrite(pPager->jfd, aJournalMagic, 8, iHdrOff+4+nMaster+8)) + if( (0 != (rc = write32bits(pPager->jfd, iHdrOff, PAGER_MJ_PGNO(pPager)))) + || (0 != (rc = sqlite3OsWrite(pPager->jfd, zMaster, nMaster, iHdrOff+4))) + || (0 != (rc = write32bits(pPager->jfd, iHdrOff+4+nMaster, nMaster))) + || (0 != (rc = write32bits(pPager->jfd, iHdrOff+4+nMaster+4, cksum))) + || (0 != (rc = sqlite3OsWrite(pPager->jfd, aJournalMagic, 8, iHdrOff+4+nMaster+8))) ){ return rc; } @@ -2512,7 +2512,7 @@ int sqlite3PagerPagecount(Pager *pPager, int *pnPage){ i64 n = 0; /* File size in bytes returned by OsFileSize() */ assert( isOpen(pPager->fd) || pPager->tempFile ); - if( isOpen(pPager->fd) && (rc = sqlite3OsFileSize(pPager->fd, &n)) ){ + if( isOpen(pPager->fd) && (0 != (rc = sqlite3OsFileSize(pPager->fd, &n))) ){ pager_error(pPager, rc); return rc; } |