From: drh <drh@noemail.net>
Date: Tue, 1 Sep 2020 00:09:45 +0000 (+0000)
Subject: Minor changes - fix a compiler warning and add an assert().
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fin-early-out;p=thirdparty%2Fsqlite.git

Minor changes - fix a compiler warning and add an assert().

FossilOrigin-Name: 07222dce106d22257fa5dc8ec46296ae47b7fc8345fd4d7aa0a4b15ddd40f3cb
---

diff --git a/manifest b/manifest
index fdddb245db..7e0da32d22 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\sSEEK_COUNT\sinstrumentation\senhancement\sfrom\strunk.
-D 2020-08-31T19:58:08.868
+C Minor\schanges\s-\sfix\sa\scompiler\swarning\sand\sadd\san\sassert().
+D 2020-09-01T00:09:45.771
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -499,7 +499,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 7e081d33aab4a9d761c39dccf3c3872c35501565d2ed9db66301918d23bc7901
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 436af4968c6954d304fce9efa12719367bd8f37b19b93b71d6ad607e85adbb47
-F src/main.c e913d3c2a1743c065fee9a00debb50d5f95b289401435c49a981609f390ae537
+F src/main.c 1e63a47af5315b1b4a743eb26185f656b56157cf41176349c5f94114bd09ba44
 F src/malloc.c 22d5bdd9fe88ae4fad1b91a1b9735104b82853ffef868f1f05517d60dc1875f5
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -607,7 +607,7 @@ F src/upsert.c 2920de71b20f04fe25eb00b655d086f0ba60ea133c59d7fa3325c49838818e78
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c c0c7977de7ef9b8cb10f6c85f2d0557889a658f817b0455909a49179ba4c8002
 F src/vacuum.c 492422c1463c076473bae1858799c7a0a5fe87a133d1223239447c422cd26286
-F src/vdbe.c a0ce31a5dc3dd5a6933fb616e1d1fcafb2a09143580b729b8346777227e5231a
+F src/vdbe.c bc2a53bf3a0ea9b303106139e8a8b3765c27c3a2f57068ef8116bfc215ca9b36
 F src/vdbe.h 83603854bfa5851af601fc0947671eb260f4363e62e960e8a994fb9bbcd2aaa1
 F src/vdbeInt.h 43341faf09fb620acc962be62ae339e7b77715207862e2b2e596f7f2f39e3828
 F src/vdbeapi.c c5e7cb2ab89a24d7f723e87b508f21bfb1359a04db5277d8a99fd1e015c12eb9
@@ -1879,7 +1879,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 e9d983c6830efdfdb734409465f071f38acf3050571aadb9b05b885328baf77c dca5b91926431768babac28a6faf7674a5014db95caba727995b470e92b3182a
-R cc2aec3d62a349e75ae66ac642473988
+P 689ede95644fb45ecaeae539d4e3163819f5de2c50e76bf6860f3a0c184d6e57
+R a1cb332ff51a57074a0e0041bc85403c
 U drh
-Z 7d19aa57c71995be053e59dd057811e6
+Z 3090de8c3b9d02274474dc76197de746
diff --git a/manifest.uuid b/manifest.uuid
index 3c8c0cb057..09ba521861 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-689ede95644fb45ecaeae539d4e3163819f5de2c50e76bf6860f3a0c184d6e57
\ No newline at end of file
+07222dce106d22257fa5dc8ec46296ae47b7fc8345fd4d7aa0a4b15ddd40f3cb
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 18deb1299d..072d92a5a1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4248,6 +4248,7 @@ int sqlite3_test_control(int op, ...){
     case SQLITE_TESTCTRL_SEEK_COUNT: {
       sqlite3 *db = va_arg(ap, sqlite3*);
       u64 *pn = va_arg(ap, sqlite3_uint64*);
+      (void)db;  /* Silence a harmless warning */
       *pn = sqlite3BtreeSeekCount(db->aDb->pBt);
       break;
     }
diff --git a/src/vdbe.c b/src/vdbe.c
index 63033986cf..22dc3f9d03 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -5970,6 +5970,7 @@ case OP_IfNoHope: {     /* jump, in3, group */
   assert( pOp->p1>=0 && pOp->p1<p->nCursor );
   pC = p->apCsr[pOp->p1];
   assert( pC!=0 );
+  assert( pC->eCurType==CURTYPE_BTREE );
   if( pC->seekHit>=2 ){
     /* There has been one or more successful OP_IdxXX opcodes ("successful"
     ** in the sense that the jump was not taken because the key and index