New ALWAYS() and assert() to mark unreachable branches in rtree.c.

FossilOrigin-Name: f7ad73c49507c9436adc7fe1b865f801eefcc7ea6b3ba35e83e63029beb03016

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 8f81757ff286803110e7706fe9e88f0a6faf1ff6..72623e075188c887147a0c95eff6397a8067aca7 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -2742,13 +2742,14 @@ static int removeNode(Rtree *pRtree, RtreeNode *pNode, int iHeight){
 
   /* Remove the entry in the parent cell. */
   rc = nodeParentIndex(pRtree, pNode, &iCell);
-  if( rc==SQLITE_OK ){
+  if( ALWAYS(rc==SQLITE_OK) ){
     pParent = pNode->pParent;
     pNode->pParent = 0;
     rc = deleteCell(pRtree, pParent, iCell, iHeight+1);
+    assert( rc==SQLITE_OK );
   }
   rc2 = nodeRelease(pRtree, pParent);
-  if( rc==SQLITE_OK ){
+  if( ALWAYS(rc==SQLITE_OK) ){
     rc = rc2;
   }
   if( rc!=SQLITE_OK ){
@@ -2968,7 +2969,7 @@ static int rtreeInsertCell(
     }
   }else{
     rc = AdjustTree(pRtree, pNode, pCell);
-    if( rc==SQLITE_OK ){
+    if( ALWAYS(rc==SQLITE_OK) ){
       if( iHeight==0 ){
         rc = rowidWrite(pRtree, pCell->iRowid, pNode->iNode);
       }else{

diff --git a/manifest b/manifest
index 8361f120b0456ade3eb20cc75d2975b4572372d5..e29199bb7562876bfc50a1316ac1f65690396d9a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\srtree.c,\sremove\san\sincorrect\sALWAYS().\s\sAdd\sother\sALWAYS()\sand\sNEVER().
-D 2021-09-15T19:53:22.421
+C New\sALWAYS()\sand\sassert()\sto\smark\sunreachable\sbranches\sin\srtree.c.
+D 2021-09-16T05:24:40.469
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -393,7 +393,7 @@ F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c3350
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/geopoly.c 98d45533989e908bf65b43f36ff6eaad95a9ffe6f3b6b8658fbd47d45c58b10b
-F ext/rtree/rtree.c 4470c4fd405c1ec35f7aac6ab0f59891f594683b0c4f83568ffddcef1dcf67b9
+F ext/rtree/rtree.c 7898027fcf24e9648755c84aee477a5cf36e56f783f55d02d053c0409d57b30a
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test 00792b030a4e188ff1b22e8530e8aa0452bb5dd81c2b18cb004afc7dc63e040e
 F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
@@ -1923,7 +1923,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 fbba89dac9591c56da81bd0808910fbc64640f3ccfd95845ecab4d3aea46ca61
-R 2c69388bcd2c3f1462a992a8816f99b5
+P cbaac8878aac0623beb5af3bc79a5b1c0179213206fd658b8c4fcc3531889480
+R 37a433ae96b1c5a938d63509ab7d490e
 U drh
-Z c5f4368b0b32f822020a893f9117fc36
+Z d12f96c6d48b6f5bf9c6c89486ebfbc1

diff --git a/manifest.uuid b/manifest.uuid
index 466cb6a019b4d11841065ab2a78491c5a437db24..3251ebd0083096fef987eb2da1fa3b3428568f01 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cbaac8878aac0623beb5af3bc79a5b1c0179213206fd658b8c4fcc3531889480
\ No newline at end of file
+f7ad73c49507c9436adc7fe1b865f801eefcc7ea6b3ba35e83e63029beb03016
\ No newline at end of file