Fix some harmless compiler warnings.

FossilOrigin-Name: 307195c8709d7fd2a642baa8011eb0c88cfdc0ac

diff --git a/manifest b/manifest
index 0aa39583863143a123cb750102d24edae26fd958..ad6e53acd509382cb6ac52b2d235dacd92cda6b1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sintegrity_check\sto\sanalyze\sthe\scells\sof\sa\spage\sin\sreverse\sorder,\sas\s\nthis\swill\stend\sto\sinsert\sthe\scells\sinto\sthe\sanalysis\sheap\sin\sincreasing\sorder\nby\saddress,\swhich\sis\sthe\smost\sefficient\sway\sto\sload\sa\smin-heap.
-D 2015-07-01T01:31:14.408
+C Fix\ssome\sharmless\scompiler\swarnings.
+D 2015-07-01T04:08:40.538
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 285a0a234ed7610d431d91671c136098c2bd86a9
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -269,7 +269,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
 F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
-F src/btree.c a0eb750d855376724ba51401e0d2077d48fdb8d7
+F src/btree.c 075ce6ddce9e66277c898f5b6a44a8a7c61c8125
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h c54d380cb262549c4176e0d665518cc1a3861bdf
 F src/build.c b3f15255d5b16e42dafeaa638fd4f8a47c94ed70
@@ -1364,7 +1364,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P fe144dd73f7097a17c24c7812c2a1cc40466e6da
-R d902bce857a438ed4cf7acbfc3ed2c71
+P 59ad912c4c1f858e04d27b1b8f25581a5f6e5daf
+R 71a875c7f3b6312a533d9c1fd4d005d9
 U drh
-Z b555330269cc680cca0da8f0e05cbcf3
+Z 39cb6954bdcd951136843b690dd37c51

diff --git a/manifest.uuid b/manifest.uuid
index cd48e349e20e36516226bf80553645b17fd6086d..71a9643813d9fdf4a54a522aa4352e1d2037bda4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-59ad912c4c1f858e04d27b1b8f25581a5f6e5daf
\ No newline at end of file
+307195c8709d7fd2a642baa8011eb0c88cfdc0ac
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index d8a9df42aad1c8a80185e10bfd4592caadd34e8b..a8e5beb22741c2b28739ec5f2ed62424a21da645 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -1037,6 +1037,9 @@ static void btreeParseCellPtrNoPayload(
   assert( pPage->leaf==0 );
   assert( pPage->noPayload );
   assert( pPage->childPtrSize==4 );
+#ifndef SQLITE_DEBUG
+  UNUSED_PARAMETER(pPage);
+#endif
   pInfo->nSize = 4 + getVarint(&pCell[4], (u64*)&pInfo->nKey);
   pInfo->nPayload = 0;
   pInfo->nLocal = 0;
@@ -1234,6 +1237,8 @@ static u16 cellSizePtrNoPayload(MemPage *pPage, u8 *pCell){
   ** this function verifies that this invariant is not violated. */
   CellInfo debuginfo;
   pPage->xParseCell(pPage, pCell, &debuginfo);
+#else
+  UNUSED_PARAMETER(pPage);
 #endif
 
   assert( pPage->childPtrSize==4 );
@@ -9105,11 +9110,8 @@ static int checkTreePage(
     /* EVIDENCE-OF: R-02776-14802 The cell pointer array consists of K 2-byte
     ** integer offsets to the cell contents. */
     for(i=nCell-1; i>=0; i--){
-      int pc = get2byteAligned(&data[cellStart+i*2]);
-      u32 size = 65536;
-      if( pc<=usableSize-4 ){
-        size = pPage->xCellSize(pPage, &data[pc]);
-      }
+      u32 pc = get2byteAligned(&data[cellStart+i*2]);
+      u32 size = pPage->xCellSize(pPage, &data[pc]);
       if( (int)(pc+size-1)>=usableSize ){
         pCheck->zPfx = 0;
         checkAppendMsg(pCheck,