diff options
author | drh <drh@noemail.net> | 2012-10-09 18:51:44 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2012-10-09 18:51:44 +0000 |
commit | 5a05be1b684ce17ef0a1d3d6dc27d46bcc2ec1ff (patch) | |
tree | 320979f0c8cc61edd19a86ec2f9030cd8594edaa /src/os_unix.c | |
parent | 5a55826bcda624f8fa4a3b7cc0c8845a689d8957 (diff) | |
download | sqlite-5a05be1b684ce17ef0a1d3d6dc27d46bcc2ec1ff.tar.gz sqlite-5a05be1b684ce17ef0a1d3d6dc27d46bcc2ec1ff.zip |
Attempt to suppress warnings generated by Coverity.
FossilOrigin-Name: 7b1a6e6cb5099076bf19db142b17c99044a869cd
Diffstat (limited to 'src/os_unix.c')
-rw-r--r-- | src/os_unix.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 0852eb1a8..5fbac0071 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -2086,13 +2086,13 @@ static int dotlockUnlock(sqlite3_file *id, int eFileLock) { ** Close a file. Make sure the lock has been released before closing. */ static int dotlockClose(sqlite3_file *id) { - int rc; + int rc = SQLITE_OK; if( id ){ unixFile *pFile = (unixFile*)id; dotlockUnlock(id, NO_LOCK); sqlite3_free(pFile->lockingContext); + rc = closeUnixFile(id); } - rc = closeUnixFile(id); return rc; } /****************** End of the dot-file lock implementation ******************* @@ -2296,10 +2296,12 @@ static int flockUnlock(sqlite3_file *id, int eFileLock) { ** Close a file. */ static int flockClose(sqlite3_file *id) { + int rc = SQLITE_OK; if( id ){ flockUnlock(id, NO_LOCK); + rc = closeUnixFile(id); } - return closeUnixFile(id); + return rc; } #endif /* SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORK */ @@ -4098,7 +4100,7 @@ static int unixShmMap( if( pShmNode->h>=0 ){ pMem = mmap(0, szRegion, pShmNode->isReadonly ? PROT_READ : PROT_READ|PROT_WRITE, - MAP_SHARED, pShmNode->h, pShmNode->nRegion*szRegion + MAP_SHARED, pShmNode->h, szRegion*(i64)pShmNode->nRegion ); if( pMem==MAP_FAILED ){ rc = unixLogError(SQLITE_IOERR_SHMMAP, "mmap", pShmNode->zFilename); |