From: drh <drh@noemail.net>
Date: Sat, 16 Dec 2017 04:37:15 +0000 (+0000)
Subject: Add unnecessary initializations to some local variables in the rtree module
X-Git-Tag: version-3.22.0~148
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=468c649331dc631a5821adb24083bf5d96dfb9dc;p=thirdparty%2Fsqlite.git

Add unnecessary initializations to some local variables in the rtree module
to suppress false-positive compiler warnings coming out of MSVC.

FossilOrigin-Name: 64487d658cb3b6c8c67f1e198c70813c963de52599f3ea974bdc2aa432e74de9
---

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index ff15a192a1..ddabacf408 100644
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -2021,7 +2021,7 @@ static int ChooseLeaf(
 ){
   int rc;
   int ii;
-  RtreeNode *pNode;
+  RtreeNode *pNode = 0;
   rc = nodeAcquire(pRtree, 1, 0, &pNode);
 
   for(ii=0; rc==SQLITE_OK && ii<(pRtree->iDepth-iHeight); ii++){
@@ -2896,7 +2896,7 @@ static int rtreeDeleteRowid(Rtree *pRtree, sqlite3_int64 iDelete){
   */
   if( rc==SQLITE_OK && pRtree->iDepth>0 && NCELL(pRoot)==1 ){
     int rc2;
-    RtreeNode *pChild;
+    RtreeNode *pChild = 0;
     i64 iChild = nodeGetRowid(pRtree, pRoot, 0);
     rc = nodeAcquire(pRtree, iChild, pRoot, &pChild);
     if( rc==SQLITE_OK ){
diff --git a/manifest b/manifest
index 657245305a..c09e354d38 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\s"swarmvtab"\sextension.\sSee\sheader\scomments\sin\sext/misc/unionvtab.c\nfor\sdetails.
-D 2017-12-15T20:21:17.831
+C Add\sunnecessary\sinitializations\sto\ssome\slocal\svariables\sin\sthe\srtree\smodule\nto\ssuppress\sfalse-positive\scompiler\swarnings\scoming\sout\sof\sMSVC.
+D 2017-12-16T04:37:15.013
 F Makefile.in 6a879cbf01e37f9eac131414955f71774b566502d9a57ded1b8585b507503cb8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a2492b29176edc3c754aa7a2f7daa20cd3fa20a56e3ee64e376092836177c42a
@@ -338,7 +338,7 @@ F ext/repair/test/checkfreelist01.test 3e8aa6aeb4007680c94a8d07b41c339aa635cc782
 F ext/repair/test/checkindex01.test 6945d0ffc0c1dc993b2ce88036b26e0f5d6fcc65da70fc9df27c2647bb358b0f
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/rtree.c cc91b6905bf55512c6ebc7dfdd37ac81c86f1753db8cfa6d62f0ee864464044f
+F ext/rtree/rtree.c 2111f685ae07988622c241f819b56fea60782f56e32f97e334473c59f6083481
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test 82a353747fcab1083d114b2ac84723dfefdbf86c1a6e1df57bf588c7d4285436
 F ext/rtree/rtree2.test 5f25b01acd03470067a2d52783b2eb0a50bf836803d4342d20ca39e541220fe2
@@ -1681,7 +1681,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 42af190f4f86ad60de02800054010fafd484ac86ca41e2a13799b2e583eea98c
-R 23f432208fb9ea9e9693297333855e09
-U dan
-Z ee61a0a249e7c85137482dc433509d6a
+P 01c173651ab22b7b0c139eded6f2ad8504efd09088df8ae6a3471230ebf2306f
+R e261edbb5cf2d21265b23f8e0074b2f2
+U drh
+Z c0a264eb11df5fc17a94051fa60030ca
diff --git a/manifest.uuid b/manifest.uuid
index 72e6a84022..9c14ed954f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-01c173651ab22b7b0c139eded6f2ad8504efd09088df8ae6a3471230ebf2306f
\ No newline at end of file
+64487d658cb3b6c8c67f1e198c70813c963de52599f3ea974bdc2aa432e74de9
\ No newline at end of file