diff options
| author | dan <dan@noemail.net> | 2009-08-24 18:57:58 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2009-08-24 18:57:58 +0000 |
| commit | 6aa657f76b78c432111ec51e4f6cba195523c7f0 (patch) | |
| tree | 49f8700513816d1e9105680acb0f35eb8c541de6 /src/os_unix.c | |
| parent | 30a89a384551f78e56aa8b814aa97d22727648fa (diff) | |
| download | sqlite-6aa657f76b78c432111ec51e4f6cba195523c7f0.tar.gz sqlite-6aa657f76b78c432111ec51e4f6cba195523c7f0.zip | |
Fix some errors in [http://www.sqlite.org/src/vdiff/aa6acfa8caa2ef59b4c16dfe42c4b5644da96905|aa6acfa8ca].
FossilOrigin-Name: 82d1934a428a34c292a612fb67bbcea262990e0f
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 99312604a..65259a756 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1428,7 +1428,6 @@ static int closePendingFds(unixFile *pFile){ rc = SQLITE_IOERR_CLOSE; p->pNext = pError; pError = p; - assert(0); }else{ sqlite3_free(p); } @@ -2609,7 +2608,7 @@ static int afpUnlock(sqlite3_file *id, int locktype) { struct unixOpenCnt *pOpen = pFile->pOpen; pOpen->nLock--; assert( pOpen->nLock>=0 ); - if( pOpen->nLock==0 && pOpen->nPending>0 ){ + if( pOpen->nLock==0 ){ rc = closePendingFds(pFile); } } @@ -3817,7 +3816,7 @@ static int unixOpen( if( pUnused ){ fd = pUnused->fd; }else{ - pUnused = sqlite3_malloc(sizeof(pUnused)); + pUnused = sqlite3_malloc(sizeof(*pUnused)); if( !pUnused ){ return SQLITE_NOMEM; } |