From: drh <drh@noemail.net>
Date: Tue, 12 Nov 2019 16:21:27 +0000 (+0000)
Subject: For for the previous check-in:  Always enable the nUri variable, even
X-Git-Tag: version-3.31.0~327
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2c40e931083dba2367a46ba4b6f2e460d62cf07;p=thirdparty%2Fsqlite.git

For for the previous check-in:  Always enable the nUri variable, even
when debugging is turned off.

FossilOrigin-Name: f84a15394c369cbdb6fba87c603a609722cf1f499626c7f20699060273ab5081
---

diff --git a/manifest b/manifest
index 57b773943d..2291a5ff71 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\smain\sfilename\sand\sthe\sjournal\sfilenames\sin\sthe\spager\nobject\sare\sall\scorrectly\sdouble-zero\sterminated.
-D 2019-11-12T14:43:47.100
+C For\sfor\sthe\sprevious\scheck-in:\s\sAlways\senable\sthe\snUri\svariable,\seven\nwhen\sdebugging\sis\sturned\soff.
+D 2019-11-12T16:21:27.628
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -513,7 +513,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c a76a75f179cb233d54e505c3e0c84832224cfe5dfb3ee470bdcaf1ed29da57ab
 F src/os_win.c 035a813cbd17f355bdcad7ab894af214a9c13a1db8aeac902365350b98cd45a7
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c 122d1e3e79424166d27a3a2768260bc613ac5acf99ea523f6127292636a589ed
+F src/pager.c f975b274d552dbb397bcf2907f9a6d9b97edb68ea1f7c7ec04d6d13087bbf71f
 F src/pager.h 217921e81eb5fe455caa5cda96061959706bcdd29ddb57166198645ef7822ac3
 F src/parse.y 17c1ae265e1b92cb1f3f1661b020e3eb31f2d8b9588322d2b6f2b22f25b674c9
 F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
@@ -1849,7 +1849,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 28091a48aa6994f8d7c142b5851bcd6b4e9a93a7bbef6c927a6182d24f3245b4
-R 0451857d71a08492adf8df03311a6e2f
+P df51ae19c1aa4c26f2dcd427eddc1c9cc24b698e1ab0a948b198a57432e25e1e
+R ecb7ca7248fc1fb124610fe41fc163c3
 U drh
-Z 43dce68710a14946b20ee1369e8095d5
+Z 9a1bd82043aef075ed04780f43f196e5
diff --git a/manifest.uuid b/manifest.uuid
index 1ebd6a545f..f287f557e0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-df51ae19c1aa4c26f2dcd427eddc1c9cc24b698e1ab0a948b198a57432e25e1e
\ No newline at end of file
+f84a15394c369cbdb6fba87c603a609722cf1f499626c7f20699060273ab5081
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index 8e1fff7b1b..9ec8f58df9 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -4761,9 +4761,7 @@ int sqlite3PagerOpen(
   u32 szPageDflt = SQLITE_DEFAULT_PAGE_SIZE;  /* Default page size */
   const char *zUri = 0;    /* URI args to copy */
   int nUriByte = 1;        /* Number of bytes of URI args at *zUri */
-#ifdef SQLITE_DEBUG
   int nUri = 0;            /* Number of URI parameters */
-#endif
 
   /* Figure out how much space is required for each journal file-handle
   ** (there are two of them, the main journal and the sub-journal).  */
@@ -4802,9 +4800,7 @@ int sqlite3PagerOpen(
     while( *z ){
       z += strlen(z)+1;
       z += strlen(z)+1;
-#ifdef SQLITE_DEBUG
       nUri++;
-#endif
     }
     nUriByte = (int)(&z[2] - zUri);
     assert( nUriByte>=1 );