aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordan <dan@noemail.net>2020-05-06 19:22:59 +0000
committerdan <dan@noemail.net>2020-05-06 19:22:59 +0000
commitfc87ab8c4ab229a2adae3297148eb3ebdad1134f (patch)
tree255a3b07c07b74252dac0b0c22d1ec72eb6e646c /src
parent861fb1e9dc039f00ff4997254b956352f37d71ac (diff)
downloadsqlite-fc87ab8c4ab229a2adae3297148eb3ebdad1134f.tar.gz
sqlite-fc87ab8c4ab229a2adae3297148eb3ebdad1134f.zip
Fix compiler warnings in non-SQLITE_ENABLE_SETLK_TIMEOUT builds.
FossilOrigin-Name: 22de99ef410ba2a540871f3e61157d8dc4b969416f14808aeca73971b17fcd51
Diffstat (limited to 'src')
-rw-r--r--src/btree.c2
-rw-r--r--src/wal.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/btree.c b/src/btree.c
index 47b1136fd..47585f1a3 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -3476,7 +3476,7 @@ int sqlite3BtreeBeginTrans(Btree *p, int wrflag, int *pSchemaVersion){
}
if( rc!=SQLITE_OK ){
- sqlite3PagerWalWriteLock(pPager, 0);
+ (void)sqlite3PagerWalWriteLock(pPager, 0);
unlockBtreeIfUnused(pBt);
}
sqlite3PagerWalDb(pPager, 0);
diff --git a/src/wal.c b/src/wal.c
index 41a11d654..c348f0f38 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -2197,7 +2197,7 @@ static int walLockWriter(Wal *pWal){
# define walEnableBlocking(x) 0
# define walDisableBlocking(x)
# define walLockWriter(pWal) walLockExclusive((pWal), WAL_WRITE_LOCK, 1)
-# define sqlite3WalDb(pWal)
+# define sqlite3WalDb(pWal, db)
#endif /* ifdef SQLITE_ENABLE_SETLK_TIMEOUT */
/*
@@ -2853,7 +2853,7 @@ int sqlite3WalBeginReadTransaction(Wal *pWal, int *pChanged){
** its intent. To avoid the race condition this leads to, ensure that
** there is no checkpointer process by taking a shared CKPT lock
** before checking pInfo->nBackfillAttempted. */
- walEnableBlocking(pWal);
+ (void)walEnableBlocking(pWal);
rc = walLockShared(pWal, WAL_CKPT_LOCK);
walDisableBlocking(pWal);
@@ -3732,7 +3732,7 @@ int sqlite3WalCheckpoint(
if( rc==SQLITE_OK ){
walDisableBlocking(pWal);
rc = walIndexReadHdr(pWal, &isChanged);
- walEnableBlocking(pWal);
+ (void)walEnableBlocking(pWal);
if( isChanged && pWal->pDbFd->pMethods->iVersion>=3 ){
sqlite3OsUnfetch(pWal->pDbFd, 0, 0);
}