Remove an unreachable branch in the error handling logic for

sqlite3BtreePayloadChecked().

FossilOrigin-Name: 293bf3ed7e40745349c83b202b27ed1b48517e1a

diff --git a/manifest b/manifest
index f2f739774b2f49829a6e285609f57722f1798ca1..1a7e283a21d7d01dc30b15aa690a13da8c6dad6e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvement\sto\sthe\sOP_Permutation\sopcode\sto\sprevent\sit\sfrom\susing\sCPU\scycles\nfor\sinitialization\sin\sprepared\sstatements\sthat\sdo\snot\suse\sthat\sopcode.
-D 2017-01-26T18:00:00.328
+C Remove\san\sunreachable\sbranch\sin\sthe\serror\shandling\slogic\sfor\nsqlite3BtreePayloadChecked().
+D 2017-01-26T21:30:00.788
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -333,7 +333,7 @@ F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
-F src/btree.c 6fe6a5853148b623c4f5e288ae916180632ebbd3
+F src/btree.c bd72bb69abc7f3f3513308b9dd3749194b5d66d1
 F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
 F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
 F src/build.c 9e799f1edd910dfa8a0bc29bd390d35d310596af
@@ -1547,7 +1547,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 b4803184652e5f4f823c1521412bc480baeb3dbf
-R 5d2cc4b6c4ee841c772ca9230a25766d
+P b4a98f65564a0d9fba2fef95ebd00a39b3e1e572
+R 9abdd03cd61c16f0272c0fd74c72cba7
 U drh
-Z 39169c59805d0271c33a4d8ecd6430ca
+Z 4b9455997c313589c1136c73cb07a07d

diff --git a/manifest.uuid b/manifest.uuid
index bf55d47b0196cbaca74c48e8069fdfcb8a091ac7..f992289f0125cedff8031bf77216f5ab236baf42 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b4a98f65564a0d9fba2fef95ebd00a39b3e1e572
\ No newline at end of file
+293bf3ed7e40745349c83b202b27ed1b48517e1a
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 0a2106e04bde948912c1d38ab80b51846e2e9ae3..e4a7aa160fc6ccac7d1f7c24f998d00d1f0cbe69 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -4683,7 +4683,7 @@ static SQLITE_NOINLINE int accessPayloadChecked(
     return SQLITE_ABORT;
   }
   assert( cursorOwnsBtShared(pCur) );
-  rc = restoreCursorPosition(pCur);
+  rc = btreeRestoreCursorPosition(pCur);
   return rc ? rc : accessPayload(pCur, offset, amt, pBuf, 0);
 }
 int sqlite3BtreePayloadChecked(BtCursor *pCur, u32 offset, u32 amt, void *pBuf){