From: mistachkin <mistachkin@noemail.net>
Date: Mon, 27 Oct 2014 19:42:02 +0000 (+0000)
Subject: Fix harmless compiler warning in an assert statement.
X-Git-Tag: version-3.8.8~217
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a95d8ca1fad1133a39ab65c60e7b7346f9089749;p=thirdparty%2Fsqlite.git

Fix harmless compiler warning in an assert statement.

FossilOrigin-Name: d33a1ff3aad0bfabf70a98ac338a68f82074e4fe
---

diff --git a/manifest b/manifest
index 3bfe9532df..c24ca49842 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sthe\smacro\sname\sof\san\s#ifdef
-D 2014-10-27T19:39:51.561
+C Fix\sharmless\scompiler\swarning\sin\san\sassert\sstatement.
+D 2014-10-27T19:42:02.875
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -172,7 +172,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c 7f841396adfd47507ff670a471162d2bfcda3136
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
-F src/btree.c 812c03daa8be68daf623dd0349ecb18e9f988967
+F src/btree.c 0e3262c36b69bed3c5f9260313286a2e8c060ca5
 F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
 F src/btreeInt.h 026d0129724e8f265fdc60d44ec240cf5a4e6179
 F src/build.c 67bb05b1077e0cdaccb2e36bfcbe7a5df9ed31e8
@@ -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 ffb9d8144bbc35bf3d929e0e13a663668fff0558
-R 517f6fa1cedd5526f59aa045554cf442
-U drh
-Z d3a8b97f7ef904d82264d3ec79cf2202
+P 9646a136e69cf2583965dfc9fac5f056af4cdb62
+R c8728e917d07299237654ca84312b584
+U mistachkin
+Z 269b8116d90b241ccd2319871bd381eb
diff --git a/manifest.uuid b/manifest.uuid
index 70a2bdb89a..3bcc889db6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9646a136e69cf2583965dfc9fac5f056af4cdb62
\ No newline at end of file
+d33a1ff3aad0bfabf70a98ac338a68f82074e4fe
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 06dfd2cd53..39d1e81a3f 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -1308,7 +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 );
-  assert( nByte < pPage->pBt->usableSize-8 );
+  assert( nByte < (int)(pPage->pBt->usableSize-8) );
 
   assert( pPage->cellOffset == hdr + 12 - 4*pPage->leaf );
   gap = pPage->cellOffset + 2*pPage->nCell;