Warning cleanup from the MSVC compile.

FossilOrigin-Name: 26cd015c0ee1c18dd37f11b47ce35cfa320b3514

diff --git a/manifest b/manifest
index aa0928931a571d54cf82fe557e4f4eff52126dc2..04ad70f01fc4261447bd670a2c210cfa93ecde8c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Attempt\sto\shandle\snumbers\sat\sthe\slimits\sof\sthe\sIEEE\s754\srange\sbetter\s(nan.test\snow\spasses).
-D 2009-09-07T03:48:53
+C Warning\scleanup\sfrom\sthe\sMSVC\scompile.
+D 2009-09-07T04:38:36
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 73ddeec9dd10b85876c5c2ce1fdce627e1dcc7f8
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -100,7 +100,7 @@ F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
 F src/alter.c 55b601857d924e07c91cfa69e9b2cb5093498c93
-F src/analyze.c 4584556d374fe3ab791be9be32ada7713fdced52
+F src/analyze.c 5a8b8aa3d170eac5e71af45458cec61f83c623ee
 F src/attach.c 13995348fc5a26cdd136a50806faf292aabc173f
 F src/auth.c 4cfb8fae12656cca2739176abebab84ed79dd8f6
 F src/backup.c 6f1c2d9862c8a3feb7739dfcca02c1f5352e37f3
@@ -110,7 +110,7 @@ F src/btree.c 6b60ece56141bbe23aa6efca10f1612d34271c2f
 F src/btree.h 577448a890c2ab9b21e6ab74f073526184bceebe
 F src/btreeInt.h 1c86297e69380f6577e7ae67452597dd8d5c2705
 F src/build.c df8dfff696329c192240e3d532f9dad0ef5abace
-F src/callback.c 9bc0ae998f15207d3115224979331c0aafc9bcc3
+F src/callback.c f49c305dc94b78da948953c392963929c0e70f9b
 F src/complete.c 5ad5c6cd4548211867c204c41a126d73a9fbcea0
 F src/date.c ab5f7137656652a48434d64f96bdcdc823bb23b3
 F src/delete.c 6b95963dabd558d45385e9b5be1fb4aa7ba7fa62
@@ -126,7 +126,7 @@ F src/journal.c e00df0c0da8413ab6e1bb7d7cab5665d4a9000d0
 F src/legacy.c 303b4ffcf1ae652fcf5ef635846c563c254564f6
 F src/lempar.c 0c4d1ab0a5ef2b0381eb81a732c54f68f27a574d
 F src/loadext.c 0e88a335665db0b2fb4cece3e49dcb65d832635a
-F src/main.c 572da463c5616ff8d1e1c5df4bb7566085b52b7c
+F src/main.c 6688d56c2437eed4a8bbbb2fd517c59ff927f337
 F src/malloc.c b1725183bcc4ce2e569f1b65da844dc3e4c7a643
 F src/mem0.c f2f84062d1f35814d6535c9f9e33de3bfb3b132c
 F src/mem1.c e6d5c23941288df8191b8a98c28e3f57771e2270
@@ -157,13 +157,13 @@ F src/pragma.c 0a3b3141935dbea48575af8131d0fd2c1efe9b06
 F src/prepare.c 9803fc01f0db29ac4a17fa662902af285f37c06b
 F src/printf.c 508a1c59433353552b6553cba175eaa7331f8fc1
 F src/random.c 676b9d7ac820fe81e6fb2394ac8c10cff7f38628
-F src/resolve.c e78029b04dd811e4e0b7be6c51e7c31accc024b6
+F src/resolve.c 941843301f6fda6c6350839c6955a172441a0782
 F src/rowset.c c64dafba1f9fd876836c8db8682966b9d197eb1f
 F src/select.c 8bc7347fe88cf16ac2cb1a37fb918d1417ab4142
 F src/shell.c db2643650b9268df89a4bedca3f1c6d9e786f1bb
 F src/sqlite.h.in 94052f827890de6fb7c913b95507076909261d9b
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
-F src/sqliteInt.h 12f2e4a8aa97c5ae9a83b8189d1280c84922cbfd
+F src/sqliteInt.h 0abbf6e260e19e41f1d57dbf02b1283f77cce81a
 F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
 F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
 F src/table.c cc86ad3d6ad54df7c63a3e807b5783c90411a08d
@@ -200,21 +200,21 @@ F src/test_tclvar.c 9e42fa59d3d2f064b7ab8628e7ab2dc8a9fe93d4
 F src/test_thread.c b8a1ab7ca1a632f18e8a361880d5d65eeea08eac
 F src/test_wsd.c 3ae5101de6cbfda2720152ab659ea84079719241
 F src/tokenize.c af8a56e6a50c5042fc305bfa796275e9bf26ff2b
-F src/trigger.c 8158237fc5fa4b51a126a294791729c64d27a0a9
-F src/update.c 12ffd68c2f241c730d5e051eb29b23e90682ff8a
-F src/utf.c 3ca2c9461b8e942c68da28bfccd448663f536a6f
+F src/trigger.c 55cdf9d595ded7f5843e5ac021722c19fe0451fa
+F src/update.c 3e97974baa914f32d4ae690fa0cb7281aff8cd39
+F src/utf.c 99cf927eabb104621ba889ac0dd075fc1657ad30
 F src/util.c 59d4e9456bf1fe581f415a783fa0cee6115c8f35
 F src/vacuum.c 3fe0eebea6d2311c1c2ab2962887d11f7a4dcfb0
-F src/vdbe.c addf5f6fefe9b9c6ca8819efbf52cfce8bd68089
+F src/vdbe.c a158f0f3efbf2a66037dbfe4024398719cf61596
 F src/vdbe.h 080fe6bc1264438becb8bf9b9f3c84074c336b78
 F src/vdbeInt.h 6094e60f64d7a9d4352d4e6b90d1219dce947ad9
 F src/vdbeapi.c 8d5013ab6104be757c208a70ffb191cc27d2b688
-F src/vdbeaux.c a88ef864f13ed698a267bcec29af22fbcd727f82
+F src/vdbeaux.c f13f4bc61c96837ee1ac531ee2401b6181244886
 F src/vdbeblob.c f93cb60ac388633ed3bde8a94ef161ad2dbfb689
 F src/vdbemem.c dc551981833756ea34a3e0b238f759479e7cf526
 F src/vtab.c 3e54fe39374e5feb8b174de32a90e7a21966025d
 F src/walker.c 1edca756275f158b80f20eb6f104c8d3fcc96a04
-F src/where.c a3218dfcf32e3d933270b76a72b97065f24b3f2c
+F src/where.c 15b38ff11d83f749ac61ef2ab5ad7ddbee273d69
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
@@ -750,7 +750,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 438e1577d0f9ceb2851ee0df0df18f0229eca491
-R c2daf7f44258efdd4b9472e2943bb165
+P 2a74ae1969aeec93576a44e11177677e6f3cea9c
+R 8cf719dccba8f130bf794b448e1f87bd
 U shane
-Z 2480ce6a3608c9caf8089d33acaa4dae
+Z 6418a3cacb4f862c4527545d609ab4e2

diff --git a/manifest.uuid b/manifest.uuid
index 9dcb56fba4690c12348f66f3105722f47b111ee8..7de8f3f009f9d7a9ccc4e0d7890719f11d460544 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2a74ae1969aeec93576a44e11177677e6f3cea9c
\ No newline at end of file
+26cd015c0ee1c18dd37f11b47ce35cfa320b3514
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 273856d0afb1f93099bc3999d82c86ed305e469e..01b4ad44b9f579887c6c9e0f40564dcd24cc7e62 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -49,7 +49,7 @@ static void openStatTable(
   };
 
   int aRoot[] = {0, 0};
-  int aCreateTbl[] = {0, 0};
+  u8 aCreateTbl[] = {0, 0};
 
   int i;
   sqlite3 *db = pParse->db;
@@ -506,6 +506,8 @@ void sqlite3DeleteIndexSamples(Index *pIdx){
     sqlite3DbFree(dbMem, pIdx->aSample);
     pIdx->aSample = 0;
   }
+#else
+  UNUSED_PARAMETER(pIdx);
 #endif
 }
 
@@ -609,7 +611,7 @@ int sqlite3AnalysisLoad(sqlite3 *db, int iDb){
             assert( pIdx->aSample );
             {
               IndexSample *pSample = &pIdx->aSample[iSample];
-              pSample->eType = eType;
+              pSample->eType = (u8)eType;
               if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
                 pSample->u.r = sqlite3_column_double(pStmt, 2);
               }else if( eType==SQLITE_TEXT || eType==SQLITE_BLOB ){
@@ -622,7 +624,7 @@ int sqlite3AnalysisLoad(sqlite3 *db, int iDb){
                 if( n>24 ){
                   n = 24;
                 }
-                pSample->nByte = n;
+                pSample->nByte = (u8)n;
                 pSample->u.z = sqlite3DbMallocRaw(dbMem, n);
                 if( pSample->u.z ){
                   memcpy(pSample->u.z, z, n);

diff --git a/src/callback.c b/src/callback.c
index 0d4f9dd15f1a63448a0e1d9a298a7d26f0b40bd0..492e4206f98706f2f65791ae1ba1058a0c53a760 100644 (file)
--- a/src/callback.c
+++ b/src/callback.c
@@ -83,7 +83,7 @@ static int synthCollSeq(sqlite3 *db, CollSeq *pColl){
 */
 CollSeq *sqlite3GetCollSeq(
   sqlite3* db,          /* The database connection */
-  int enc,              /* The desired encoding for the collating sequence */
+  u8 enc,               /* The desired encoding for the collating sequence */
   CollSeq *pColl,       /* Collating sequence with native encoding, or NULL */
   const char *zName     /* Collating sequence name */
 ){

diff --git a/src/main.c b/src/main.c
index 9bc46190fd2f7fb0f1ce139d9de29a8bfab103cb..e4324e74848f70b09903040056368f5652e78000 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1359,8 +1359,8 @@ int sqlite3_extended_errcode(sqlite3 *db){
 static int createCollation(
   sqlite3* db,
   const char *zName, 
-  int enc,
-  int collType,
+  u8 enc,
+  u8 collType,
   void* pCtx,
   int(*xCompare)(void*,int,const void*,int,const void*),
   void(*xDel)(void*)
@@ -1808,7 +1808,7 @@ int sqlite3_create_collation(
   int rc;
   sqlite3_mutex_enter(db->mutex);
   assert( !db->mallocFailed );
-  rc = createCollation(db, zName, enc, SQLITE_COLL_USER, pCtx, xCompare, 0);
+  rc = createCollation(db, zName, (u8)enc, SQLITE_COLL_USER, pCtx, xCompare, 0);
   rc = sqlite3ApiExit(db, rc);
   sqlite3_mutex_leave(db->mutex);
   return rc;
@@ -1828,7 +1828,7 @@ int sqlite3_create_collation_v2(
   int rc;
   sqlite3_mutex_enter(db->mutex);
   assert( !db->mallocFailed );
-  rc = createCollation(db, zName, enc, SQLITE_COLL_USER, pCtx, xCompare, xDel);
+  rc = createCollation(db, zName, (u8)enc, SQLITE_COLL_USER, pCtx, xCompare, xDel);
   rc = sqlite3ApiExit(db, rc);
   sqlite3_mutex_leave(db->mutex);
   return rc;
@@ -1851,7 +1851,7 @@ int sqlite3_create_collation16(
   assert( !db->mallocFailed );
   zName8 = sqlite3Utf16to8(db, zName, -1);
   if( zName8 ){
-    rc = createCollation(db, zName8, enc, SQLITE_COLL_USER, pCtx, xCompare, 0);
+    rc = createCollation(db, zName8, (u8)enc, SQLITE_COLL_USER, pCtx, xCompare, 0);
     sqlite3DbFree(db, zName8);
   }
   rc = sqlite3ApiExit(db, rc);

diff --git a/src/resolve.c b/src/resolve.c
index 857b67d813b6965642ae48b8b7f4d19c6aab9bbf..4090bdd6ec458df8dc06457727903b8591411891 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -261,7 +261,7 @@ static int lookupName(
             testcase( iCol==32 );
             pParse->oldmask |= (iCol>=32 ? 0xffffffff : (((u32)1)<<iCol));
           }
-          pExpr->iColumn = iCol;
+          pExpr->iColumn = (i16)iCol;
           pExpr->pTab = pTab;
           isTrigger = 1;
         }

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index a8a1da67828013fdd475bfff7b1214f96f1494be..c77721ba26d3566198e9348d410d0b0ff53e17db 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2805,7 +2805,7 @@ void sqlite3ValueFree(sqlite3_value*);
 sqlite3_value *sqlite3ValueNew(sqlite3 *);
 char *sqlite3Utf16to8(sqlite3 *, const void*, int);
 #ifdef SQLITE_ENABLE_STAT2
-char *sqlite3Utf8to16(sqlite3 *, int, char *, int, int *);
+char *sqlite3Utf8to16(sqlite3 *, u8, char *, int, int *);
 #endif
 int sqlite3ValueFromExpr(sqlite3 *, Expr *, u8, u8, sqlite3_value **);
 void sqlite3ValueApplyAffinity(sqlite3_value *, u8, u8);
@@ -2831,7 +2831,7 @@ int sqlite3ResolveOrderGroupBy(Parse*, Select*, ExprList*, const char*);
 void sqlite3ColumnDefault(Vdbe *, Table *, int, int);
 void sqlite3AlterFinishAddColumn(Parse *, Token *);
 void sqlite3AlterBeginAddColumn(Parse *, SrcList *);
-CollSeq *sqlite3GetCollSeq(sqlite3*, int, CollSeq *, const char*);
+CollSeq *sqlite3GetCollSeq(sqlite3*, u8, CollSeq *, const char*);
 char sqlite3AffinityType(const char*);
 void sqlite3Analyze(Parse*, Token*, Token*);
 int sqlite3InvokeBusyHandler(BusyHandler*);

diff --git a/src/trigger.c b/src/trigger.c
index e17b48e742e0abae443bbfa5fcf5f0b87365d6fa..00acc813e285aff6232279304ff4e407070555b1 100644 (file)
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -695,7 +695,7 @@ static int codeTriggerProgram(
     **   INSERT INTO t1 ... ;            -- insert into t2 uses REPLACE policy
     **   INSERT OR IGNORE INTO t1 ... ;  -- insert into t2 uses IGNORE policy
     */
-    pParse->eOrconf = (orconf==OE_Default)?pStep->orconf:orconf;
+    pParse->eOrconf = (orconf==OE_Default)?pStep->orconf:(u8)orconf;
 
     switch( pStep->op ){
       case TK_UPDATE: {
@@ -955,6 +955,8 @@ void sqlite3CodeRowTrigger(
 ){
   Trigger *p;
 
+  UNUSED_PARAMETER(newIdx);
+
   assert(op == TK_UPDATE || op == TK_INSERT || op == TK_DELETE);
   assert(tr_tm == TRIGGER_BEFORE || tr_tm == TRIGGER_AFTER );
 

diff --git a/src/update.c b/src/update.c
index 8015b04cc4fa7992cb86494dffb0d20effaf8d61..ba1ad91f2c5d1992131e8b86a50c6ec06e4bf4e0 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -127,7 +127,7 @@ void sqlite3Update(
   int regOldRowid;       /* The old rowid */
   int regNewRowid;       /* The new rowid */
   int regNew;
-  int regOld;
+  int regOld = 0;
   int regRowSet = 0;     /* Rowset of rows to be updated */
   int regRec;            /* Register used for new table record to insert */
 

diff --git a/src/utf.c b/src/utf.c
index 159ac90b900431aaef2313efae0351f0127b7442..c3d07be8287daf780c17ed45e1e65b56a75f0136 100644 (file)
--- a/src/utf.c
+++ b/src/utf.c
@@ -465,7 +465,7 @@ char *sqlite3Utf16to8(sqlite3 *db, const void *z, int nByte){
 ** flag set.
 */
 #ifdef SQLITE_ENABLE_STAT2
-char *sqlite3Utf8to16(sqlite3 *db, int enc, char *z, int n, int *pnOut){
+char *sqlite3Utf8to16(sqlite3 *db, u8 enc, char *z, int n, int *pnOut){
   Mem m;
   memset(&m, 0, sizeof(m));
   m.db = db;

diff --git a/src/vdbe.c b/src/vdbe.c
index e6b325abc161832a8e68a75cdc4f7ba82bccf211..dd2ff7b9f59eeb27ed09629946857db9e9c99450 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -4863,7 +4863,7 @@ case OP_Program: {        /* jump */
   p->pFrame = pFrame;
   p->aMem = &VdbeFrameMem(pFrame)[-1];
   p->nMem = pFrame->nChildMem;
-  p->nCursor = pFrame->nChildCsr;
+  p->nCursor = (u16)pFrame->nChildCsr;
   p->apCsr = (VdbeCursor **)&p->aMem[p->nMem+1];
   p->aOp = pProgram->aOp;
   p->nOp = pProgram->nOp;

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 546c16fe9bda6d30d52031172629eb02f5a6b179..efbf6b15d84781ecbf4f3a063c00700aa43a39d3 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -2761,6 +2761,8 @@ int sqlite3VdbeIdxRowid(sqlite3 *db, BtCursor *pCur, i64 *rowid){
   u32 lenRowid;     /* Size of the rowid */
   Mem m, v;
 
+  UNUSED_PARAMETER(db);
+
   /* Get the size of the index entry.  Only indices entries of less
   ** than 2GiB are support - anything large must be database corruption.
   ** Any corruption is detected in sqlite3BtreeParseCellPtr(), though, so

diff --git a/src/where.c b/src/where.c
index f23133b57e23c622a54a3f8934a88fca331c2fdf..9859ab558715e7c91fa01e970294693c1d5be70a 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -2357,7 +2357,7 @@ static void bestBtreeIndex(
     nRow = (double)(aiRowEst[nEq] * nInMul);
     if( bInEst && nRow*2>aiRowEst[0] ){
       nRow = aiRowEst[0]/2;
-      nInMul = nRow / aiRowEst[nEq];
+      nInMul = (int)(nRow / aiRowEst[nEq]);
     }
 
     /* Assume constant cost to access a row and logarithmic cost to