Remove superfluous code from btree.c. (CVS 4964)

FossilOrigin-Name: 40173010706fb52ecd60197ce6e97d51a1899267

diff --git a/manifest b/manifest
index 8ebfc302ae5a993bfbe2ba81ba00a41fc5d36fb1..1ee1e1d2bd51c3dedea67118695ecd0ee7edbe74 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\szTail\sreturn\sfrom\ssqlite3_prepare()\sis\sinitialized\seven\nif\sthere\sis\sa\smalloc\sfailure.\s(CVS\s4963)
-D 2008-04-03T21:42:21
+C Remove\ssuperfluous\scode\sfrom\sbtree.c.\s(CVS\s4964)
+D 2008-04-03T21:46:57
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in b861627d91df5ee422c54237aa38296954dc0151
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -86,7 +86,7 @@ F src/attach.c bdc75e759ca25a16f4dc7fbdbc6d37ad2561bb24
 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
 F src/bitvec.c 49817d442e51e4123585f3cf3c2afc293a3c91e2
 F src/btmutex.c 483ced3c52205b04b97df69161fadbf87f4f1ea2
-F src/btree.c 680c357b178146dd37910f42f9e6e8a2a7b1e61d
+F src/btree.c ee340ad90103fe70526f7b0c3728d185dd470f20
 F src/btree.h c66cb17c6fffa84a88926dbef173bab4ae692fd4
 F src/btreeInt.h 8a2718652ed9413dc6acbb02a5c5a23a35a6e983
 F src/build.c 5d36a6041202a1f3a8b2eee3a631cbce74e5f696
@@ -625,7 +625,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 1d67f41c885d052ab10a33892938a85b56882b3d
-R fc70bbceae3dbd97e8cb18355cf2864b
+P 040cffe2727936ce9228666fce5b00db47493e7d
+R b5169b7863cd504077cbda35abe0563a
 U drh
-Z 2d7d7824dd62626268f381b72c76b1f6
+Z 7be2f0423e0cd7f7d3a718451f5f8fd0

diff --git a/manifest.uuid b/manifest.uuid
index 20051a285f1323f077c2deb6ba453ab06b1a8b85..07b969d719318008f8a1dda6179e1d363cbc92fd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-040cffe2727936ce9228666fce5b00db47493e7d
\ No newline at end of file
+40173010706fb52ecd60197ce6e97d51a1899267
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 8bac8429f2dbf846a6d474f7f3796cc5a6c1ee38..452bf22b43e5526818b1789c4b28742bc7422b11 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.450 2008/04/02 18:33:08 drh Exp $
+** $Id: btree.c,v 1.451 2008/04/03 21:46:57 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -3780,7 +3780,7 @@ sqlite3 *sqlite3BtreeCursorDb(const BtCursor *pCur){
 ** was already pointing to the last entry in the database before
 ** this routine was called, then set *pRes=1.
 */
-static int btreeNext(BtCursor *pCur, int *pRes){
+int sqlite3BtreeNext(BtCursor *pCur, int *pRes){
   int rc;
   MemPage *pPage;
 
@@ -3840,12 +3840,6 @@ static int btreeNext(BtCursor *pCur, int *pRes){
   rc = moveToLeftmost(pCur);
   return rc;
 }
-int sqlite3BtreeNext(BtCursor *pCur, int *pRes){
-  int rc;
-  assert( cursorHoldsMutex(pCur) );
-  rc = btreeNext(pCur, pRes);
-  return rc;
-}
 
 
 /*
@@ -3854,7 +3848,7 @@ int sqlite3BtreeNext(BtCursor *pCur, int *pRes){
 ** was already pointing to the first entry in the database before
 ** this routine was called, then set *pRes=1.
 */
-static int btreePrevious(BtCursor *pCur, int *pRes){
+int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){
   int rc;
   Pgno pgno;
   MemPage *pPage;
@@ -3908,12 +3902,6 @@ static int btreePrevious(BtCursor *pCur, int *pRes){
   *pRes = 0;
   return rc;
 }
-int sqlite3BtreePrevious(BtCursor *pCur, int *pRes){
-  int rc;
-  assert( cursorHoldsMutex(pCur) );
-  rc = btreePrevious(pCur, pRes);
-  return rc;
-}
 
 /*
 ** Allocate a new page from the database file.