Fix harmless compiler warnings.

FossilOrigin-Name: a12d214ecccc5d3372dbcedc88705b0092363971

diff --git a/manifest b/manifest
index 81c7f73bd77f2a6e5a05f59efb1e3dce8c5a1e04..27c9a6e154b9c1534a04755ba12bb237ab8c4ae6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\smemory\ssubsystem\srelated\sdefines\sto\sthe\scompile-time\soptions\slist.
-D 2013-12-03T22:32:48.485
+C Fix\sharmless\scompiler\swarnings.
+D 2013-12-03T22:33:35.657
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -194,7 +194,7 @@ F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
 F src/mem2.c dce31758da87ec2cfa52ba4c5df1aed6e07d8e8f
 F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
-F src/mem5.c 2221f7e4619619d2df16fcb8a1da2a165ae56d9d
+F src/mem5.c 19d9271cb936742707b6118ed44d779657c7c511
 F src/memjournal.c 0683aac6cab6ec2b5374c0db37c0deb2436a3785
 F src/mutex.c d3b66a569368015e0fcb1ac15f81c119f504d3bc
 F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
@@ -1145,10 +1145,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P eca7d3f1612c7a009a9e4ef89f76f9b7e275d1e6
-R 532b42dc23159f7eb49f2139c4b28b74
-T *branch * memTests
-T *sym-memTests *
-T -sym-trunk *
+P 52a44146dd7c5a7662545042045e23deab302c96
+R 2b3d133e432ced9c3134bb1e5c9a52ed
 U mistachkin
-Z 95952b1fd2b9669de1eabdf9cc1c4e34
+Z c9f1aceb76bb9affc6fd3e7a6bcd7640

diff --git a/manifest.uuid b/manifest.uuid
index 08e424e306ff396b80a32d0da15848bafbf7e474..f54177f7c815771c7e5d3da3dd8dc5410897255e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-52a44146dd7c5a7662545042045e23deab302c96
\ No newline at end of file
+a12d214ecccc5d3372dbcedc88705b0092363971
\ No newline at end of file

diff --git a/src/mem5.c b/src/mem5.c
index 3870e9148884985d0ff8b16df93fb5cea3dcd843..4674ec68f5f6a63097c8833ce1f332683467b007 100644 (file)
--- a/src/mem5.c
+++ b/src/mem5.c
@@ -202,7 +202,7 @@ static void memsys5Leave(void){
 static int memsys5Size(void *p){
   int iSize = 0;
   if( p ){
-    int i = ((u8 *)p-mem5.zPool)/mem5.szAtom;
+    int i = (int)(((u8 *)p-mem5.zPool)/mem5.szAtom);
     assert( i>=0 && i<mem5.nBlock );
     iSize = mem5.szAtom * (1 << (mem5.aCtrl[i]&CTRL_LOGSIZE));
   }
@@ -289,7 +289,7 @@ static void memsys5FreeUnsafe(void *pOld){
   /* Set iBlock to the index of the block pointed to by pOld in 
   ** the array of mem5.szAtom byte blocks pointed to by mem5.zPool.
   */
-  iBlock = ((u8 *)pOld-mem5.zPool)/mem5.szAtom;
+  iBlock = (int)(((u8 *)pOld-mem5.zPool)/mem5.szAtom);
 
   /* Check that the pointer pOld points to a valid, non-free block. */
   assert( iBlock>=0 && iBlock<mem5.nBlock );