From: mistachkin <mistachkin@noemail.net>
Date: Thu, 23 Jan 2020 00:08:25 +0000 (+0000)
Subject: Fix variable declaration issue seen with MSVC.
X-Git-Tag: version-3.31.1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8122c6e9be146d8146da5357060e429afa3d4b4c;p=thirdparty%2Fsqlite.git

Fix variable declaration issue seen with MSVC.

FossilOrigin-Name: 8a6fe3066cf0599fcf2960e8fb3ae39e4e7a61ec81e8ec71d0b5910aee2c16f6
---

diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index eb20af8166..f33617465d 100644
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -5732,8 +5732,8 @@ static int fts5QueryCksum(
 ** contain valid utf-8, return non-zero.
 */
 static int fts5TestUtf8(const char *z, int n){
-  assert_nc( n>0 );
   int i = 0;
+  assert_nc( n>0 );
   while( i<n ){
     if( (z[i] & 0x80)==0x00 ){
       i++;
diff --git a/manifest b/manifest
index b2cf57e72d..8ea2e399ee 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sNEVER()\smacro\sthat\scan\sbe\strue\sif\scompiled\swith\nSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION.\nTicket\s[b985f0bd1636d9bc]
-D 2020-01-22T23:08:19.183
+C Fix\svariable\sdeclaration\sissue\sseen\swith\sMSVC.
+D 2020-01-23T00:08:25.098
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -117,7 +117,7 @@ F ext/fts5/fts5_buffer.c 5a5fe0159752c0fb0a5a93c722e9db2662822709490769d482b76a6
 F ext/fts5/fts5_config.c b447948f35ad3354e8fe5e242e0a7e7b5b941555400b9404259944e3aa570037
 F ext/fts5/fts5_expr.c 2be456484786333d559dc2987a00f2750981fab91d52db8452a8046278c5f22e
 F ext/fts5/fts5_hash.c 1cc0095646f5f3b46721aa112fb4f9bf29ae175cb5338f89dcec66ed97acfe75
-F ext/fts5/fts5_index.c e3573c88ce8238f7a5892c777a9ddf646c1355012780337d783fb2dfc3dca650
+F ext/fts5/fts5_index.c f25bec3c00bf050fa2d702d97b773d0706692661172026ddac8df1f164b8b198
 F ext/fts5/fts5_main.c e881a2ea0bf01b3a3ff0bc1b31373c58fd54b6c9f3c43ea3d431bea4e5d4025e
 F ext/fts5/fts5_storage.c 3ecda8edadc1f62a355d6789776be0da609f8658c50d72e422674093ab7e1528
 F ext/fts5/fts5_tcl.c 39bcbae507f594aad778172fa914cad0f585bf92fd3b078c686e249282db0d95
@@ -1857,7 +1857,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 f6affdd41608946fcfcea914ece149038a8b25a62bbe719ed2561c649b86d824
-R 97a04d4b4b8d22f5094487160af0ab4d
-U drh
-Z 50e2a3e6d4ad40b8e57cb89c95ba8068
+P 9f0f5d593a383ec2bebb6513ad566813f5b3dc6f052c61bcd76e8ac557bbb062
+R 3dde6739b8fb39a6057cde90c0083ac8
+U mistachkin
+Z 8e124fb0ab2ddc3580e7fba92dfe424c
diff --git a/manifest.uuid b/manifest.uuid
index f74435ea5e..e324b0696b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9f0f5d593a383ec2bebb6513ad566813f5b3dc6f052c61bcd76e8ac557bbb062
\ No newline at end of file
+8a6fe3066cf0599fcf2960e8fb3ae39e4e7a61ec81e8ec71d0b5910aee2c16f6
\ No newline at end of file