diff options
| author | dan <dan@noemail.net> | 2011-04-01 09:04:36 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2011-04-01 09:04:36 +0000 |
| commit | 211fb08433198000e41d4aaddff08b80f7f7fb3f (patch) | |
| tree | c5d871b9397fe52fc25c8ed6f13671d016a53de1 /src/os_unix.c | |
| parent | ce62d93837f5d95fd66c2827bae96a0a0e6fbf5e (diff) | |
| download | sqlite-211fb08433198000e41d4aaddff08b80f7f7fb3f.tar.gz sqlite-211fb08433198000e41d4aaddff08b80f7f7fb3f.zip | |
Fix some problems in os_unix.c when compiled with ENABLE_LOCKING_STYLE on OSX. Also some minor issues with test scripts.
FossilOrigin-Name: 8088031bc949bd4efb5edf33bbd1bce5700fca56
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index bf11e678a..479918107 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1594,7 +1594,7 @@ static int posixUnlock(sqlite3_file *id, int eFileLock, int handleNFSUnlock){ lock.l_whence = SEEK_SET; lock.l_start = SHARED_FIRST; lock.l_len = divSize; - if( unixFileLock(pFile,, &lock)==(-1) ){ + if( unixFileLock(pFile, &lock)==(-1) ){ tErrno = errno; rc = sqliteErrorFromPosixError(tErrno, SQLITE_IOERR_UNLOCK); if( IS_LOCK_ERROR(rc) ){ @@ -5747,7 +5747,9 @@ static int proxyCreateUnixFile( } memset(pNew, 0, sizeof(unixFile)); pNew->openFlags = openFlags; + memset(&dummyVfs, 0, sizeof(dummyVfs)); dummyVfs.pAppData = (void*)&autolockIoFinder; + dummyVfs.zName = "dummy"; pUnused->fd = fd; pUnused->flags = openFlags; pNew->pUnused = pUnused; |