Strive to prevent harmless compiler warnings in GCC 4.8.5.

FossilOrigin-Name: 8b6691f619ed9a56f6aecbd878ebb447c40984f8767508b248494fd9ec68fbaa

diff --git a/manifest b/manifest
index 1a7c97fbfa3351a8d2558986d196f3a45c5a16b9..2177c1210dea708cc84d416e5ea076ac11d25f3c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Optimize\sthe\srestarting\sof\san\sRBU\svacuum.
-D 2019-05-07T16:37:37.162
+C Strive\sto\sprevent\sharmless\scompiler\swarnings\sin\sGCC\s4.8.5.
+D 2019-05-07T17:47:43.636
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -461,7 +461,7 @@ F src/auth.c 0fac71038875693a937e506bceb492c5f136dd7b1249fbd4ae70b4e8da14f9df
 F src/backup.c b1d37f6f7f5913944583733ed0f9e182f3ece0d42c27f46701142141a6e6fd33
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c e048f240d9562ef0c6b87e9d8dfa31a08c262d6c8d52c1ac0d6ca340ed8188e0
+F src/btree.c 096a98aae7b57a0f6d119076f45e281e8b337100a304857b85986a59c6d606d1
 F src/btree.h c11446f07ec0e9dc85af8041cb0855c52f5359c8b2a43e47e02a685282504d89
 F src/btreeInt.h 6111c15868b90669f79081039d19e7ea8674013f907710baa3c814dc3f8bfd3f
 F src/build.c 23e9332b260cd0e45f6cbfabe711957a0776ea3ff836746378868fdfa64d267b
@@ -608,7 +608,7 @@ F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 F src/walker.c 7607f1a68130c028255d8d56094ea602fc402c79e1e35a46e6282849d90d5fe4
 F src/where.c 99c7b718ef846ac952016083aaf4e22ede2290beceaf4730a2df55c023251369
 F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
-F src/wherecode.c 0e76672930bea322eb3606d891a4744be55c09bcd3a995bfd501af62a46e0625
+F src/wherecode.c 37a1004237d630d785c47bba2290eac652a7a8b0047518eba3cb7c808b604c4a
 F src/whereexpr.c 7fedf990999722dafda5ab8040feac93937a6f95f4671d8d629f2baf014b4b80
 F src/window.c 038c248267e74ff70a2bb9b1884d40fd145c5183b017823ecb6cbb14bc781478
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1824,8 +1824,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 91f701d39852ef1ddb29d1527d1520867c5efea110333315c55d8b08084384e7 7b051698d8a763d9db190fd662931266d24a4982f34f100a28641934c222e37b
-R 8e0011462278f668f3cc12d5a8c4e1e9
-T +closed 7b051698d8a763d9db190fd662931266d24a4982f34f100a28641934c222e37b
-U dan
-Z a1edb1bdf5023ec77a1208563fa197ca
+P 82062351a62f4ccc438a2b47a22ee581bd030dec952fecd610f360a25002a5ea
+R 4f39e2e7a0d63e22242e3f88eda624cc
+U drh
+Z 38298ab91e1e4b87a848f20cfed8bc7a

diff --git a/manifest.uuid b/manifest.uuid
index ad4d935e1a617ff88f0bc4072c20dac098d89b20..974d4569052bfef1b4de7e19040f8740f7e0c240 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-82062351a62f4ccc438a2b47a22ee581bd030dec952fecd610f360a25002a5ea
\ No newline at end of file
+8b6691f619ed9a56f6aecbd878ebb447c40984f8767508b248494fd9ec68fbaa
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index e98cb7b05d4344b84c49c4a9e1c1544b9619cc2f..d0be549900f37e1e3029c50736f18d6ef6977541 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -7989,6 +7989,7 @@ static int balance_nonroot(
       while( i==cntOldNext ){
         iOld++;
         assert( iOld<nNew || iOld<nOld );
+        assert( iOld>=0 && iOld<NB );
         pOld = iOld<nNew ? apNew[iOld] : apOld[iOld];
         cntOldNext += pOld->nCell + pOld->nOverflow + !leafData;
       }

diff --git a/src/wherecode.c b/src/wherecode.c
index 6aadb24142a4b1139d1e6e355a58c1017cb70075..a6254484593383cc199011f72af6d7a47147d980 100644 (file)
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -2115,7 +2115,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
     sqlite3VdbeGoto(v, pLevel->addrBrk);
     sqlite3VdbeResolveLabel(v, iLoopBody);
 
-    if( pWInfo->nLevel>1 ) sqlite3StackFree(db, pOrTab);
+    if( pWInfo->nLevel>1 ){ sqlite3StackFree(db, pOrTab); }
     if( !untestedTerms ) disableTerm(pLevel, pTerm);
   }else
 #endif /* SQLITE_OMIT_OR_OPTIMIZATION */