Fix an unused variable in btree.c:allocateSpace().

FossilOrigin-Name: 637246165a14c4808b90d0437e4d43fa5fac659e

diff --git a/manifest b/manifest
index 94ec16445ae8d87469ea820aa9d080eaadc23358..3991d3d55bc060fc2c40febe8c426d28decf4c33 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Optimizations\saimed\sat\sreducing\sthe\snumber\sof\smemcpy()\soperations\srequired\sby\sbalance_nonroot().
-D 2014-10-27T14:26:54.508
+C Fix\san\sunused\svariable\sin\sbtree.c:allocateSpace().
+D 2014-10-27T18:21:01.498
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -172,7 +172,7 @@ F src/auth.c d8abcde53426275dab6243b441256fcd8ccbebb2
 F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
-F src/btree.c 9790fb4df51d36861bcbb8cd0a9b41586cbae699
+F src/btree.c 812c03daa8be68daf623dd0349ecb18e9f988967
 F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
 F src/btreeInt.h 026d0129724e8f265fdc60d44ec240cf5a4e6179
 F src/build.c 9dc2bd94347b878c89627000c92b0c8d97ec2919
@@ -1207,7 +1207,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P fc6920b5483eeeb06a474ff399a21afa51dc4859 1f80f8c136ac970dcc7fb2337263dc5922e348c3
-R ed2304a6a2e587056109284e9717f063
-U dan
-Z 986c15e36469a97fa56839a4b2a55b25
+P face33bea1ba3a6d57780655fa827226b4d2baa9
+R 10f6daecfdf5443eb311db2d487f32a3
+U drh
+Z a48d68bafb210b7d63c9203bfcb49102

diff --git a/manifest.uuid b/manifest.uuid
index 37f4629c8732459741dd83e8bd435c6319a85dfd..28889facf2531ee50a8651dfeae4c91679faf932 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-face33bea1ba3a6d57780655fa827226b4d2baa9
\ No newline at end of file
+637246165a14c4808b90d0437e4d43fa5fac659e
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 9b14dc2b6e0cff1ad3496fc1cacb6244f41d99ff..06dfd2cd538fa3090cc86305b5973cd0068ad95d 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -1301,7 +1301,6 @@ static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
   int top;                             /* First byte of cell content area */
   int gap;        /* First byte of gap between cell pointers and cell content */
   int rc;         /* Integer return code */
-  int usableSize; /* Usable size of the page */
   
   assert( sqlite3PagerIswriteable(pPage->pDbPage) );
   assert( pPage->pBt );
@@ -1309,8 +1308,7 @@ static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
   assert( nByte>=0 );  /* Minimum cell size is 4 */
   assert( pPage->nFree>=nByte );
   assert( pPage->nOverflow==0 );
-  usableSize = pPage->pBt->usableSize;
-  assert( nByte < usableSize-8 );
+  assert( nByte < pPage->pBt->usableSize-8 );
 
   assert( pPage->cellOffset == hdr + 12 - 4*pPage->leaf );
   gap = pPage->cellOffset + 2*pPage->nCell;