Fix compiler warnings with MSVC build. (CVS 6741)

FossilOrigin-Name: 0bd84e7387802c58c820369ff27ef54adbdf2e96

diff --git a/manifest b/manifest
index 39dcb9ef9d3f0a98d10686769d3fa8a29df3779d..1bfafba7d2d07ddcba1c1c7cd4fa30f28eba8f41 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sa\sfalse\sfailure\sreport\sin\sthe\stest\sscripts\scaused\sby\sthe\svdbe\sstack\s"compression"\sscript.\s(CVS\s6740)
-D 2009-06-09T18:14:18
+C Fix\scompiler\swarnings\swith\sMSVC\sbuild.\s(CVS\s6741)
+D 2009-06-09T18:58:53
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -106,7 +106,7 @@ F src/auth.c 98db07c2088455797678eb1031f42d4d94d18a71
 F src/backup.c ff50af53184a5fd7bdee4d620b5dabef74717c79
 F src/bitvec.c 0ef0651714728055d43de7a4cdd95e703fac0119
 F src/btmutex.c 9b899c0d8df3bd68f527b0afe03088321b696d3c
-F src/btree.c a3c7d36de0e97405912d11061d1805e7e969fac5
+F src/btree.c e626616c3b7501d4d79e7ff2e48743c20255b3b8
 F src/btree.h f70b694e8c163227369a66863b01fbff9009f323
 F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5
 F src/build.c 20e02fd72249159ff6829009f3029d16d59cdff5
@@ -151,7 +151,7 @@ F src/pager.h 73f481a308a873ccd626d97331c081db3b53e2e5
 F src/parse.y 07690df997d50b3fdb5e5121e5a27f1a080db13d
 F src/pcache.c 395f752a13574120bd7513a400ba02a265aaa76d
 F src/pcache.h 9b927ccc5a538e31b4c3bc7eec4f976db42a1324
-F src/pcache1.c 3de4feb556a11a62febe172ca98655dff68a0df3
+F src/pcache1.c 97e7e8e6e34026fb43b47d08532b0c02e959c26c
 F src/pragma.c 06b3a4b93a5e587f1c04b4a40016eb360792cdf3
 F src/prepare.c 889208e3567a98bb3d345a30f63240beb9ac90f9
 F src/printf.c 508a1c59433353552b6553cba175eaa7331f8fc1
@@ -203,11 +203,11 @@ F src/update.c 6ae6c26adff8dc34532d578f66e6cfde04b5d177
 F src/utf.c 9541d28f40441812c0b40f00334372a0542c00ff
 F src/util.c 8ff385a6b474e840d4fa3621f5f7263028ac892c
 F src/vacuum.c 0e14f371ea3326c6b8cfba257286d798cd20db59
-F src/vdbe.c 60ca5ae05f5ab4ec10336465817931fc1002768e
+F src/vdbe.c 20cf0b0b388685b759077db32002eb0dd3770436
 F src/vdbe.h 35a648bc3279a120da24f34d9a25213ec15daf8a
 F src/vdbeInt.h 3727128255a93d116e454f67d4559700f7ae4d6f
 F src/vdbeapi.c 619992b16821b989050e8a12e259d795d30731a9
-F src/vdbeaux.c 78ff6c355ccc2d211350f507bccfcd95118169e8
+F src/vdbeaux.c 14e1c6065172530a14648292371ccd3c1ea0d490
 F src/vdbeblob.c c25d7e7bc6d5917feeb17270bd275fa771f26e5c
 F src/vdbemem.c 05183d46094aa99b8f8350e5761b9369dbef35a8
 F src/vtab.c e2f4c92df7d06330b151448718c4724742ff444b
@@ -733,7 +733,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 18b78068cc94de51f081824c93f7b14c7c35726d
-R fdd2a933c6c72fa79bbfccb46e96d6c4
+P 9d3329891c2227a1a3ded1c636ac615864010ca7
+R 29a13eb275900e63ac826d07275d5f9d
 U shane
-Z 807e1768f9d656e19f7ada248b0bfe4c
+Z a716d3bc3c26080c0aad9adc8101d4dd

diff --git a/manifest.uuid b/manifest.uuid
index bfb9e8eb34dc61e004e22117f24355f75776764d..99da59120ad2b3ca662a1d0f9fd349c6ddb706c9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9d3329891c2227a1a3ded1c636ac615864010ca7
\ No newline at end of file
+0bd84e7387802c58c820369ff27ef54adbdf2e96
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 70dfa0396a26aa908bff5c9741c3921c8a2e050f..21e1a5603023cdb5ec006178318757864cd736b2 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.624 2009/06/09 13:42:25 drh Exp $
+** $Id: btree.c,v 1.625 2009/06/09 18:58:53 shane Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -803,7 +803,7 @@ static u16 cellSizePtr(MemPage *pPage, u8 *pCell){
     }
     nSize += 4;
   }
-  nSize += (pIter - pCell);
+  nSize += (u32)(pIter - pCell);
 
   /* The minimum size of any cell is 4 bytes. */
   if( nSize<4 ){
@@ -5273,7 +5273,7 @@ static int balance_quick(MemPage *pParent, MemPage *pPage, u8 *pSpace){
     while( ((*(pOut++) = *(pCell++))&0x80) && pCell<pStop );
 
     /* Insert the new divider cell into pParent */
-    insertCell(pParent, pParent->nCell, pSpace, pOut-pSpace, 0, 0);
+    insertCell(pParent, pParent->nCell, pSpace, (int)(pOut-pSpace), 0, 0);
 
     /* Set the right-child pointer of pParent to point to the new page. */
     put4byte(&pParent->aData[pParent->hdrOffset+8], pgnoNew);
@@ -6019,8 +6019,8 @@ static int balance(BtCursor *pCur){
   u8 aBalanceQuickSpace[13];
   u8 *pFree = 0;
 
-  TESTONLY( int balance_quick_called = 0; );
-  TESTONLY( int balance_deeper_called = 0; );
+  TESTONLY( int balance_quick_called = 0 );
+  TESTONLY( int balance_deeper_called = 0 );
 
   do {
     int iPage = pCur->iPage;

diff --git a/src/pcache1.c b/src/pcache1.c
index 879705ff62d67b1d2bb2c8c4da2d3705274fdf4d..1bff0e532cdc0977500bd213a635678af3fedc4e 100644 (file)
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -16,7 +16,7 @@
 ** If the default page cache implementation is overriden, then neither of
 ** these two features are available.
 **
-** @(#) $Id: pcache1.c,v 1.16 2009/06/03 21:04:36 drh Exp $
+** @(#) $Id: pcache1.c,v 1.17 2009/06/09 18:58:53 shane Exp $
 */
 
 #include "sqliteInt.h"
@@ -368,7 +368,7 @@ static void pcache1TruncateUnsafe(
   PCache1 *pCache, 
   unsigned int iLimit 
 ){
-  TESTONLY( int nPage = 0; )      /* Used to assert pCache->nPage is correct */
+  TESTONLY( unsigned int nPage = 0; )      /* Used to assert pCache->nPage is correct */
   unsigned int h;
   assert( sqlite3_mutex_held(pcache1.mutex) );
   for(h=0; h<pCache->nHash; h++){

diff --git a/src/vdbe.c b/src/vdbe.c
index 70878a7ba1a24eb23f13006a7fe5f06d5c485df5..4d05aa39251b0f9d6e6f37cc03821d904a562950 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.849 2009/06/09 18:14:18 shane Exp $
+** $Id: vdbe.c,v 1.850 2009/06/09 18:58:53 shane Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -1272,8 +1272,8 @@ case OP_Remainder: {           /* same as TK_REM, in1, in2, out3 */
         break;
       }
       default: {
-        iA = rA;
-        iB = rB;
+        iA = (i64)rA;
+        iB = (i64)rB;
         if( iA==0 ) goto arithmetic_result_is_null;
         if( iA==-1 ) iA = 1;
         rB = (double)(iB % iA);
@@ -2164,7 +2164,7 @@ case OP_Column: {
     ** not exceeded even for corrupt database files.
     */
     len = nField*5 + 3;
-    if( len > offset ) len = offset;
+    if( len > (int)offset ) len = (int)offset;
 
     /* The KeyFetch() or DataFetch() above are fast and will get the entire
     ** record header in most cases.  But they will fail to get the complete
@@ -3962,7 +3962,7 @@ case OP_RowData: {
     n = (u32)n64;
   }else{
     sqlite3BtreeDataSize(pCrsr, &n);
-    if( n>db->aLimit[SQLITE_LIMIT_LENGTH] ){
+    if( n>(u32)db->aLimit[SQLITE_LIMIT_LENGTH] ){
       goto too_big;
     }
   }

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index c1b60b0b99279ab1844e0ca3e4fd47b63f33326e..64b7e1b1ef2981bbe53ba54f1e0a87075666fee5 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -14,7 +14,7 @@
 ** to version 2.8.7, all this code was combined into the vdbe.c source file.
 ** But that file was getting too big so this subroutines were split out.
 **
-** $Id: vdbeaux.c,v 1.459 2009/06/05 14:17:25 drh Exp $
+** $Id: vdbeaux.c,v 1.460 2009/06/09 18:58:53 shane Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -2216,7 +2216,7 @@ u32 sqlite3VdbeSerialPut(u8 *buf, int nBuf, Mem *pMem, int file_format){
       v = pMem->u.i;
     }
     len = i = sqlite3VdbeSerialTypeLen(serial_type);
-    assert( len<=nBuf );
+    assert( len<=(u32)nBuf );
     while( i-- ){
       buf[i] = (u8)(v&0xFF);
       v >>= 8;
@@ -2227,7 +2227,7 @@ u32 sqlite3VdbeSerialPut(u8 *buf, int nBuf, Mem *pMem, int file_format){
   /* String or blob */
   if( serial_type>=12 ){
     assert( pMem->n + ((pMem->flags & MEM_Zero)?pMem->u.nZero:0)
-             == sqlite3VdbeSerialTypeLen(serial_type) );
+             == (int)sqlite3VdbeSerialTypeLen(serial_type) );
     assert( pMem->n<=nBuf );
     len = pMem->n;
     memcpy(buf, pMem->z, len);