Fix harmless compiler warning introduced by the setlk-snapshot-fix merge.

FossilOrigin-Name: cbab5d86517f0c57c6025aaddbb9408e29bccdc8b158d2b8d40bd2f3b333ef69

diff --git a/manifest b/manifest
index a31084e34b98400e579e15d16ccd2b70d32cbce6..54ddfdb35111a228281c8e6f1b7beec8b41dc2ee 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sto\sensure\sSQLITE_ENABLE_SETLK_TIMEOUT\sbuilds\suse\sa\sblocking\slock\nand\sdo\snot\scall\sxSleep()\swhen\s(a)\sopening\sa\ssnapshot\stransaction,\sand\n(b)\swhen\sblocked\sby\sanother\sprocess\srunning\srecovery.
-D 2025-06-05T11:57:20.960
+C Fix\sharmless\scompiler\swarning\sintroduced\sby\sthe\ssetlk-snapshot-fix\smerge.
+D 2025-06-05T13:14:46.332
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -866,7 +866,7 @@ F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf8
 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
 F src/vtab.c 828221bdbeaaa6d62126ee6d07fd4ec0d09dcaea846f87ad01944d8b7e548859
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c 78da33510b8cb1b096fb5ae9954be910998d2477ddb623e56f5df84e56b5814d
+F src/wal.c b0f848cfba8dd057f77073493cdd542f9125b4cf87941f53e9d0db21604155c8
 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
 F src/where.c 45a3b496248a0b36d91ce34da3278d54f8fa20e9d3fbd36d45a42051d1118137
@@ -2209,9 +2209,9 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 65c5e66af77a233c6255cb9fca5887269bb38566d3c5482569b8697c72e355ae
-Q +7f9c0cdd0630a41db359b188b226a1ad6a3bae1663c27169acfe25edc7fb171b
-R 0d812b70b020867d9ada415d63c65888
+P 8ac4525a2e3100bb5b9460cc49bb64f007911180d5f51461282b1de0201328b6
+Q +c1f20f89d9eb3e1dd1018c0e0efe5d3043a592f078e235ad04b960334c7186c2
+R 2e4328669cf34776de6f2dce452a9a18
 U drh
-Z 689cb8e844bd2f2b69f9acf239c1ccad
+Z f346dec9e265e58e5acbec45d51de62c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9c7ea5c54d6fc5e8c61be4ff3c0826ae192c74b4..1e9b063feb9cc3a09c6f5e2956d6ef1c7351eb1e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8ac4525a2e3100bb5b9460cc49bb64f007911180d5f51461282b1de0201328b6
+cbab5d86517f0c57c6025aaddbb9408e29bccdc8b158d2b8d40bd2f3b333ef69

diff --git a/src/wal.c b/src/wal.c
index fc176988bdeb6014ff1643277906fb58143f9d1b..1fd5b201cb1ff3773b1f2d4a32a7af7d7524ee8a 100644 (file)
--- a/src/wal.c
+++ b/src/wal.c
@@ -3076,7 +3076,7 @@ static int walTryBeginRead(Wal *pWal, int *pChanged, int useWal, int *pCnt){
       ** WAL_RETRY this routine will be called again and will probably be
       ** right on the second iteration.
       */
-      walEnableBlocking(pWal);
+      (void)walEnableBlocking(pWal);
       if( pWal->apWiData[0]==0 ){
         /* This branch is taken when the xShmMap() method returns SQLITE_BUSY.
         ** We assume this is a transient condition, so return WAL_RETRY. The