From: drh <drh@noemail.net>
Date: Mon, 25 May 2020 12:02:12 +0000 (+0000)
Subject: Make sure variable declarations are at start of scope even when
X-Git-Tag: version-3.32.1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91960aa53ff5b08f28b9edb627d8a1b62231e125;p=thirdparty%2Fsqlite.git

Make sure variable declarations are at start of scope even when
SQLITE_ENABLE_SNAPSHOT is used.

FossilOrigin-Name: a77ceaf6ba934b1d73c90b8980191a65d02ad6ce1e11e6baf573b3a132685545
---

diff --git a/manifest b/manifest
index 4b5b59e03a..b0791595ca 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\snumber\sto\s3.32.1.
-D 2020-05-24T12:36:20.131
+C Make\ssure\svariable\sdeclarations\sare\sat\sstart\sof\sscope\seven\swhen\nSQLITE_ENABLE_SNAPSHOT\sis\sused.
+D 2020-05-25T12:02:12.498
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -617,7 +617,7 @@ F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143
 F src/vdbevtab.c ee5b4c902fdda2230f9503ac7b84c6d614c91e8f6f4dc1633e2e8dfef8ffb144
 F src/vtab.c 7b452592ed2ee95dedb1f323d557cebede5a6f3b4558b21a5dca527e6ae9b12c
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
-F src/wal.c 17ea0a319d3ead17ef3b16aa30f10f2626056893effea7e609a20a6661ffec1b
+F src/wal.c 04c3d2a673192016a671eb051a1900945a8c7331f4378636a8bfb70e8e596c84
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c 3df26a33dc4f54e8771600fb7fdebe1ece0896c2ad68c30ab40b017aa4395049
 F src/where.c 9546c82056e8cdb27291f98cf1adca5d271240b399bb97b32f77fc2bea6146c9
@@ -1866,7 +1866,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 ad7bb70af9bb68d192137188bb2528f1e9e43ad164c925174ca1dafc9e1f5339
-R 9b4861350c19f604797570d532809e1e
+P 56e5063c326ffbfd3e3cb6f2b05718412aca2cb183274bfe11f5666effdd04b9
+R 01324a5a46d5370d11de237fae1d2b79
 U drh
-Z bbda9cc25034e5e4447ce8684480d98d
+Z 4612882d193bb7431c4c9f4670ae6370
diff --git a/manifest.uuid b/manifest.uuid
index 4d5c18c3a9..3f74ebb5d8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-56e5063c326ffbfd3e3cb6f2b05718412aca2cb183274bfe11f5666effdd04b9
\ No newline at end of file
+a77ceaf6ba934b1d73c90b8980191a65d02ad6ce1e11e6baf573b3a132685545
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index 63dee82330..52087e1296 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -2846,12 +2846,14 @@ int sqlite3WalSnapshotRecover(Wal *pWal){
 int sqlite3WalBeginReadTransaction(Wal *pWal, int *pChanged){
   int rc;                         /* Return code */
   int cnt = 0;                    /* Number of TryBeginRead attempts */
+#ifdef SQLITE_ENABLE_SNAPSHOT
+  int bChanged = 0;
+  WalIndexHdr *pSnapshot = pWal->pSnapshot;
+#endif
 
   assert( pWal->ckptLock==0 );
 
 #ifdef SQLITE_ENABLE_SNAPSHOT
-  int bChanged = 0;
-  WalIndexHdr *pSnapshot = pWal->pSnapshot;
   if( pSnapshot ){
     if( memcmp(pSnapshot, &pWal->hdr, sizeof(WalIndexHdr))!=0 ){
       bChanged = 1;