Minor simplification to the 32-bit varint decoder.

FossilOrigin-Name: 6ffd17b668a8ad561c37e89063afb6e7f8425e557e93025b7527fe3656585d77

diff --git a/manifest b/manifest
index 2bfc0d9967b018d2e897a0d3ec195a916448ff3c..015884cec85a41b8d3605b197e0576650d3a35f0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
-C Ensure\sthat\sthe\s"PRAGMA\sschema_version"\scommand\scauses\sthe\sschema\sto\sbe\nreparsed\sand\sreloaded.
-D 2020-07-01T16:19:14.139
+C Minor\ssimplification\sto\sthe\s32-bit\svarint\sdecoder.
+D 2020-07-02T17:05:11.341
 F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
 F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@ -20,6 +20,7 @@ F src/select.c 860daa05592ed1b38f6266f067fa020b539548ab929aa60fa59e7681e7f3f8cb
 F src/shell.c.in d663152487d4bfddea0f6d21ebc2ed51575d22657a02c6828afd344bbd4651af
 F src/test1.c fe56c4bcaa2685ca9aa25d817a0ee9345e189aff4a5a71a3d8ba946c7776feb8
 F src/update.c 6a0484134635f167594d597a33d186051125d3ef41803a90b246cea6cf7f11f9
+F src/util.c c0bacc165f46169d2b720c37c8719165e383211698fad1de39dd16a8c161815a
 F src/vdbe.c 1208cbeecb7a6293d97819c1308630421bd461ff4006785746b07467cc8ebd26
 F src/vdbeapi.c c1a9004ac554d8d48794d2ce5f80397f8e419fd28643a543cc1e004c7713c3ef
 F test/altertab.test b8b2104212e8ea87c75c3cbe3cb78ed7236a6c828ee2e59ed09d3dbe9812d002
@@ -36,7 +37,7 @@ F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfa
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
 F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
-P 2094da753feb847254473b148d11e535c44dbae9b17454f1a4f8f7e90aefba3f
-R f173a87f0b525ecb55db36f097804790
+P 27d4a9a7b530c77a5b2593d1a5232b10746da9906f8d12890de7a8fbd7270256
+R 99a7c16a071ee77c63747a35896341e7
 U drh
-Z af55a7b0f1c3b906e0bbd996c22a7eb2
+Z 9641430dad99b777a96753291abb3298

diff --git a/manifest.uuid b/manifest.uuid
index 278e50023b41e4087db38ca74fa36f3d93ee21ee..3a2e65a142fb91f02885282bbe90dd44c2c5e500 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-27d4a9a7b530c77a5b2593d1a5232b10746da9906f8d12890de7a8fbd7270256
\ No newline at end of file
+6ffd17b668a8ad561c37e89063afb6e7f8425e557e93025b7527fe3656585d77
\ No newline at end of file

diff --git a/src/util.c b/src/util.c
index 09520d1d62947acbd6fdd8cbd3c67f2f187ce263..9c462cc670708379a95cc3ff19ba478a348e8281 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1141,8 +1141,7 @@ u8 sqlite3GetVarint32(const unsigned char *p, u32 *v){
     u64 v64;
     u8 n;
 
-    p -= 2;
-    n = sqlite3GetVarint(p, &v64);
+    n = sqlite3GetVarint(p-2, &v64);
     assert( n>3 && n<=9 );
     if( (v64 & SQLITE_MAX_U32)!=v64 ){
       *v = 0xffffffff;