Changes to remove some compiler warnings from MSVC. (CVS 6294)

FossilOrigin-Name: 68f15442e8db364952d30daf4ce60c6b938f5906

diff --git a/manifest b/manifest
index 439d67722b30e0b1d21bfb319d85a3f3d2fb7da8..8aea8e85b6885a502510559db70f730609bffa08 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scompiler\swarning\sin\sbackup.c.\s(CVS\s6293)
-D 2009-02-16T16:23:09
+C Changes\sto\sremove\ssome\scompiler\swarnings\sfrom\sMSVC.\s(CVS\s6294)
+D 2009-02-16T17:55:47
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c7a5a30fb6852bd7839b1024e1661da8549878ee
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -101,7 +101,7 @@ F src/alter.c f93d13aae63ea1a5ee604d76041be354311d08a5
 F src/analyze.c fc6056826fe67aa0856d4e01591be8f9266ac415
 F src/attach.c 81d37d1948f409146a7b22b96998fd90649d1fd3
 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
-F src/backup.c dbce7056b235206f7e3c303ca52d3108b9746082
+F src/backup.c 2d3f31148d7b086c5c72d9edcd04fc2751b0aa6e
 F src/bitvec.c 44f7059ac1f874d364b34af31b9617e52223ba75
 F src/btmutex.c 63c5cc4ad5715690767ffcb741e185d7bc35ec1a
 F src/btree.c 71f30e74389aa7ae51421592dfaf69511152677c
@@ -200,7 +200,7 @@ F src/update.c 8c4925f9ca664effc8a1faaad67449d2074567b1
 F src/utf.c 1da9c832dba0fa8f865b5b902d93f420a1ee4245
 F src/util.c 1363f64351f3b544790f3c523439354c02f8c4e9
 F src/vacuum.c 4929a585ef0fb1dfaf46302f8a9c4aa30c2d9cf5
-F src/vdbe.c 473169c1957f4f06048974613ce3c1ba7d8d5c21
+F src/vdbe.c 02e70c48ffd11aa470060fa03a2bfa65d72bc8df
 F src/vdbe.h 03516f28bf5aca00a53c4dccd6c313f96adb94f6
 F src/vdbeInt.h 13cb4868ea579b5a8f6b6b5098caa99cd5a14078
 F src/vdbeapi.c b23c4b1686f150a0ddc36459c8e3876be62638e1
@@ -701,7 +701,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 88a6355cd65ddb319dbc27b5248c664dbf599778
-R 5552e6ebc399162cdd6a993d7e8fe464
-U drh
-Z 4c3c75537f9c4889ca785e51d0035c10
+P 82222fbf5d5a085ce3e2c172c648a4c6d9750626
+R 5792b17dd0ef6f8c8f8c49659a1094a2
+U shane
+Z b59c9ee7296e40d8afadf2a2abdd402b

diff --git a/manifest.uuid b/manifest.uuid
index 198938ef0f819ad1a55813e1dbdfd8cc8c1ed645..dcd99de071f3750e6b156a5692af0def955d0cee 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-82222fbf5d5a085ce3e2c172c648a4c6d9750626
\ No newline at end of file
+68f15442e8db364952d30daf4ce60c6b938f5906
\ No newline at end of file

diff --git a/src/backup.c b/src/backup.c
index aa9ff32181f43dbb196a347c03064ac9dbbdb587..9c55804790fa160603322ad186ff69837ea4ba13 100644 (file)
--- a/src/backup.c
+++ b/src/backup.c
@@ -12,7 +12,7 @@
 ** This file contains the implementation of the sqlite3_backup_XXX() 
 ** API functions and the related features.
 **
-** $Id: backup.c,v 1.11 2009/02/16 16:23:09 drh Exp $
+** $Id: backup.c,v 1.12 2009/02/16 17:55:47 shane Exp $
 */
 #include "sqliteInt.h"
 #include "btreeInt.h"
@@ -396,7 +396,7 @@ int sqlite3_backup_step(sqlite3_backup *p, int nPage){
 
         assert( pFile );
         assert( (i64)nDestTruncate*(i64)nDestPagesize >= iSize || (
-              nDestTruncate==(PENDING_BYTE_PAGE(p->pDest->pBt)-1)
+              nDestTruncate==(int)(PENDING_BYTE_PAGE(p->pDest->pBt)-1)
            && iSize>=PENDING_BYTE && iSize<=PENDING_BYTE+nDestPagesize
         ));
         if( SQLITE_OK==(rc = sqlite3PagerCommitPhaseOne(pDestPager, 0, 1))

diff --git a/src/vdbe.c b/src/vdbe.c
index 045fac6a6bb45489b0cfe3337a657127141dedc0..0b9ad1981e12c1bcd19ce3347e873291565493dd 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.816 2009/02/10 11:17:43 danielk1977 Exp $
+** $Id: vdbe.c,v 1.817 2009/02/16 17:55:47 shane Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -3490,7 +3490,7 @@ case OP_NewRowid: {           /* out2-prerelease */
     ** larger than the previous rowid.  This has been shown experimentally
     ** to double the speed of the COPY operation.
     */
-    int res, rx=SQLITE_OK, cnt;
+    int res=0, rx=SQLITE_OK, cnt;
     i64 x;
     cnt = 0;
     if( (sqlite3BtreeFlags(pC->pCursor)&(BTREE_INTKEY|BTREE_ZERODATA)) !=
@@ -3714,7 +3714,7 @@ case OP_Insert: {
 */
 case OP_Delete: {
   int i = pOp->p1;
-  i64 iKey;
+  i64 iKey = 0;
   VdbeCursor *pC;
 
   assert( i>=0 && i<p->nCursor );