Fix compiler warnings with MSVC build. (CVS 6761)

FossilOrigin-Name: e1e6430752449a34671b6c89326b03ac36ea6d9a

diff --git a/manifest b/manifest
index a41b301ac7b764ca59d77c3372fd56629418ace3..c73adc5becb3ee8c22a2ce1008ceefdc1b12cd0a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.6.15\s(CVS\s6760)
-D 2009-06-15T03:28:58
+C Fix\scompiler\swarnings\swith\sMSVC\sbuild.\s(CVS\s6761)
+D 2009-06-15T16:27:08
 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 9804315e03b017fdefabecbba7ac02f6b0fd38a9
+F src/btree.c 8363cf2ee0276cb6cee74aed3449816e19b1162d
 F src/btree.h f70b694e8c163227369a66863b01fbff9009f323
 F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5
 F src/build.c 6c7b96103cebc558710ae72e2ce99b91c8ccd961
@@ -210,9 +210,9 @@ F src/vdbeapi.c 619992b16821b989050e8a12e259d795d30731a9
 F src/vdbeaux.c 14e1c6065172530a14648292371ccd3c1ea0d490
 F src/vdbeblob.c c25d7e7bc6d5917feeb17270bd275fa771f26e5c
 F src/vdbemem.c 05183d46094aa99b8f8350e5761b9369dbef35a8
-F src/vtab.c e2f4c92df7d06330b151448718c4724742ff444b
+F src/vtab.c 98fbffc5efe68d8107511dec0a650efc7daa9446
 F src/walker.c ec4b9742a4077ef80346e2f9aaf0f44c2d95087a
-F src/where.c 86fb1a3a8842256780c810601ce0dd01b7be86af
+F src/where.c 658d99d9a2be77ebea35bfaa581d5ec9b0a11af9
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 14165b3e32715b700b5f0cbf8f6e3833dda0be45
@@ -734,7 +734,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 14df65dc04e1a944baf4fb7185a0df5a96059346
-R 6c24cc632a90c0f071b105c3575304c2
-U drh
-Z 96e323094d687db0a4d36d3789e99811
+P aff34826aa4667d24f0dbc8bea828dc0f84d2108
+R ab89da00143db50e3863f3ec2715823c
+U shane
+Z 49bb545d34c133193720edd93586168c

diff --git a/manifest.uuid b/manifest.uuid
index 473626417df2ec6b78550241204397bb1e70c9e1..6974ba11d9200c66f71c66ffb4660e054333b233 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aff34826aa4667d24f0dbc8bea828dc0f84d2108
\ No newline at end of file
+e1e6430752449a34671b6c89326b03ac36ea6d9a
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index f8f8588926d7de5b9b21cc404aaf3438f10789a9..a171488058956a92a0523f02e3d2dd8e736cbb28 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.627 2009/06/14 12:47:11 drh Exp $
+** $Id: btree.c,v 1.628 2009/06/15 16:27:08 shane Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -1191,7 +1191,7 @@ int sqlite3BtreeInitPage(MemPage *pPage){
         /* Free blocks must be in accending order */
         return SQLITE_CORRUPT_BKPT; 
       }
-      nFree += size;
+      nFree = nFree + size;
       pc = next;
     }
 
@@ -5335,7 +5335,7 @@ static int balance_nonroot(MemPage *pParent, int iParentIdx, u8 *aOvflSpace){
   int nNew = 0;                /* Number of pages in apNew[] */
   int i, j, k;                 /* Loop counters */
   int nxDiv;                   /* Next divider slot in pParent->aCell[] */
-  int rc;                      /* The return code */
+  int rc = SQLITE_OK;          /* The return code */
   int leafCorrection;          /* 4 if pPage is a leaf.  0 if not */
   int leafData;                /* True if pPage is a leaf of a LEAFDATA tree */
   int usableSpace;             /* Bytes in pPage beyond the header */

diff --git a/src/vtab.c b/src/vtab.c
index 10a168162f452dd31b8f84b639815a3a9e514d3e..e315edf021e8e6c8856a88a787db16f9b1f9fcc7 100644 (file)
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** This file contains code used to help implement virtual tables.
 **
-** $Id: vtab.c,v 1.90 2009/06/02 21:31:39 drh Exp $
+** $Id: vtab.c,v 1.91 2009/06/15 16:27:08 shane Exp $
 */
 #ifndef SQLITE_OMIT_VIRTUALTABLE
 #include "sqliteInt.h"
@@ -102,6 +102,9 @@ void sqlite3VtabLock(sqlite3_vtab *pVtab){
 ** disconnect the virtual table.
 */
 void sqlite3VtabUnlock(sqlite3 *db, sqlite3_vtab *pVtab){
+#ifndef SQLITE_DEBUG
+  UNUSED_PARAMETER(db);
+#endif
   assert( pVtab->nRef>0 );
   pVtab->nRef--;
   assert(db);

diff --git a/src/where.c b/src/where.c
index e4d7b9b9a923bca98e449c6439a479a02a402dcc..f5993a364072d16f840552b39687bda3f64b7ac5 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.406 2009/06/11 17:04:28 drh Exp $
+** $Id: where.c,v 1.407 2009/06/15 16:27:08 shane Exp $
 */
 #include "sqliteInt.h"
 
@@ -661,18 +661,18 @@ static int isLikeOrGlob(
   }
   if( sqlite3ExprAffinity(pLeft)!=SQLITE_AFF_TEXT ) return 0;
   z = pRight->u.zToken;
-  cnt = 0;
   if( ALWAYS(z) ){
+    cnt = 0;
     while( (c=z[cnt])!=0 && c!=wc[0] && c!=wc[1] && c!=wc[2] ){
       cnt++;
     }
+    if( cnt!=0 && c!=0 && 255!=(u8)z[cnt-1] ){
+      *pisComplete = z[cnt]==wc[0] && z[cnt+1]==0;
+      *pnPattern = cnt;
+      return 1;
+    }
   }
-  if( cnt==0 || c==0 || 255==(u8)z[cnt-1] ){
-    return 0;
-  }
-  *pisComplete = z[cnt]==wc[0] && z[cnt+1]==0;
-  *pnPattern = cnt;
-  return 1;
+  return 0;
 }
 #endif /* SQLITE_OMIT_LIKE_OPTIMIZATION */
 
@@ -2876,8 +2876,8 @@ static Bitmask codeOneLoopStart(
     SrcList oneTab;        /* Shortened table list */
 
     int regReturn = ++pParse->nMem;           /* Register used with OP_Gosub */
-    int regRowset;                            /* Register for RowSet object */
-    int regRowid;                             /* Register holding rowid */
+    int regRowset = 0;                        /* Register for RowSet object */
+    int regRowid = 0;                         /* Register holding rowid */
     int iLoopBody = sqlite3VdbeMakeLabel(v);  /* Start of loop body */
     int iRetInit;                             /* Address of regReturn init */
     int ii;
@@ -2925,7 +2925,7 @@ static Bitmask codeOneLoopStart(
             int r;
             r = sqlite3ExprCodeGetColumn(pParse, pTabItem->pTab, -1, iCur, 
                                          regRowid, 0);
-            sqlite3VdbeAddOp4(v, OP_RowSetTest, regRowset, 
+            sqlite3VdbeAddOp4(v, OP_RowSetTest, regRowset,
                               sqlite3VdbeCurrentAddr(v)+2,
                               r, SQLITE_INT_TO_PTR(iSet), P4_INT32);
           }