From: dan <dan@noemail.net>
Date: Wed, 6 May 2020 19:22:59 +0000 (+0000)
Subject: Fix compiler warnings in non-SQLITE_ENABLE_SETLK_TIMEOUT builds.
X-Git-Tag: version-3.32.0~38^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc87ab8c4ab229a2adae3297148eb3ebdad1134f;p=thirdparty%2Fsqlite.git

Fix compiler warnings in non-SQLITE_ENABLE_SETLK_TIMEOUT builds.

FossilOrigin-Name: 22de99ef410ba2a540871f3e61157d8dc4b969416f14808aeca73971b17fcd51
---

diff --git a/manifest b/manifest
index df00f221f3..a5993cb39a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Block\son\sthe\sWRITER\slock\swhen\sattempting\sto\srun\srecovery.
-D 2020-05-06T19:14:41.236
+C Fix\scompiler\swarnings\sin\snon-SQLITE_ENABLE_SETLK_TIMEOUT\sbuilds.
+D 2020-05-06T19:22:59.197
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
 F src/backup.c 5e617c087f1c2d6005c2ec694ce80d6e16bc68d906e1b1c556d7c7c2228b636b
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 4d5a7d2208dd8d921049780c9f06201cd6a656822c4f0931807b54f3dcd79097
+F src/btree.c 98e6ff5f2f0ad531bc3f7c0be1e7c8b51339b9b1badc98da141c5e0f8ed3c9b3
 F src/btree.h 989ef3c33413549e3e148f3dcb46c030f317dac130dc86809ba6b9aa4b16c72a
 F src/btreeInt.h 887cdd2ea7f4a65143074a8a7c8928b0546f8c18dda3c06a408ce7992cbab0c0
 F src/build.c ec6c0bda1e43ef55e5f5121a77ba19fac51fc6585f95ce2da795bcedcf6e8f36
@@ -617,7 +617,7 @@ F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143
 F src/vdbevtab.c 8094dfc28dad82d60a1c832020a1b201a5381dc185c14638affc6d4e9d54c653
 F src/vtab.c 7b704a90515a239c6cdba6a66b1bb3a385e62326cceb5ecb05ec7a091d6b8515
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c d23410a4330d11b8c699e0e463f334f2fca6c5af2c144e34674ccaef5b73f8fc
+F src/wal.c 24566cac365e172a893f18a83fd6da8c4b9cfbbae118831a43b4ef427e21b710
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c 7c429c694abd12413a5c17aec9f47cfe9eba6807e6b0a32df883e8e3a14835ed
 F src/where.c 9546c82056e8cdb27291f98cf1adca5d271240b399bb97b32f77fc2bea6146c9
@@ -1689,7 +1689,7 @@ F test/walprotocol2.test 7d3b6b4bf0b12f8007121b1e6ef714bc99101fb3b48e46371df1db8
 F test/walro.test cb438d05ba0d191f10b688e39c4f0cd5b71569a1d1f4440e5bdf3c6880e08c20
 F test/walro2.test 0e79dd15cbdb4f482c01ea248373669c732414a726b357d04846a816afafb768
 F test/walrofault.test c70cb6e308c443867701856cce92ad8288cd99488fa52afab77cca6cfd51af68
-F test/walsetlk.test 9da1ee8a18b0416a5ce1914331c1303bcb6cb7bac905eb660f788f023718d8f4
+F test/walsetlk.test e919d2aab59185a554c170599ae28d46da2f085e2026d54ee2da799f9f328478
 F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 F test/walslow.test c05c68d4dc2700a982f89133ce103a1a84cc285f
 F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2af51747
@@ -1864,7 +1864,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d096ea3fe20f8af90f9e3f798fd0a69527b32ac8e208ade58b9d0af0e831f41b
-R 452bcfebade640ff986656d7117060f0
+P 105d6c9bbcadc64faa2b24e315cb13227b17cfc6bf1b3512713f80ce56976a3d
+R 2005d6d3ddc777ab35d452dcb8060dbf
 U dan
-Z 21f20f1df91440f33362da9da7770293
+Z 02001fbe394dba3af87ef0d8d6630ccb
diff --git a/manifest.uuid b/manifest.uuid
index 1ed2372a34..e7963e04d3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-105d6c9bbcadc64faa2b24e315cb13227b17cfc6bf1b3512713f80ce56976a3d
\ No newline at end of file
+22de99ef410ba2a540871f3e61157d8dc4b969416f14808aeca73971b17fcd51
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 47b1136fd7..47585f1a37 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 41a11d6548..c348f0f38b 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);
     }
diff --git a/test/walsetlk.test b/test/walsetlk.test
index ff7ec18b3f..7964caa055 100644
--- a/test/walsetlk.test
+++ b/test/walsetlk.test
@@ -51,23 +51,23 @@ do_execsql_test -db db2 1.3 {
   SELECT * FROM t1
 } {1 2 3 4 5 6 7 8}
 
-do_test 1.3 {
+do_test 1.4 {
   list [catch {db2 eval { BEGIN EXCLUSIVE }} msg] $msg
 } {1 {database is locked}}
 
-do_execsql_test 1.4 { COMMIT }
-do_execsql_test -db db2 1.5 {
+do_execsql_test 1.5 { COMMIT }
+do_execsql_test -db db2 1.6 {
   SELECT * FROM t1
 } {1 2 3 4 5 6 7 8 9 10}
 
 puts $fd "blahblahblahblah"
 flush $fd
 
-do_execsql_test -db db2 1.6 {
+do_execsql_test -db db2 1.7 {
   PRAGMA wal_checkpoint = TRUNCATE
 } {0 0 0}
 
-do_test 1.7 {
+do_test 1.8 {
   file size test.db-wal
 } 0