diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_unix.c | 4 | ||||
| -rw-r--r-- | src/test_hexio.c | 7 |
2 files changed, 9 insertions, 2 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; diff --git a/src/test_hexio.c b/src/test_hexio.c index 02bd60c8a..e3258e869 100644 --- a/src/test_hexio.c +++ b/src/test_hexio.c @@ -312,8 +312,13 @@ static int utf8_to_utf8( sqlite3TestBinToHex(z,nOut); Tcl_AppendResult(interp, (char*)z, 0); sqlite3_free(z); -#endif return TCL_OK; +#else + Tcl_AppendResult(interp, + "[utf8_to_utf8] unavailable - SQLITE_DEBUG not defined", 0 + ); + return TCL_ERROR; +#endif } static int getFts3Varint(const char *p, sqlite_int64 *v){ |