Removed a few more harmless warnings from MSVC. (CVS 6018)

FossilOrigin-Name: 72fd92bd67ed2b8e193cf3119e60d0a8f1e819c9

diff --git a/manifest b/manifest
index 433d090f3b5bdd949fc3e4196f706a3f50f53794..084cecb0d9e7583518fc035529becd5ab6d71adf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sTCL\stest\sharness\sso\sthat\sit\scompiles\sand\sruns\son\sOSX\swith\nSQLITE_ENABLE_LOCKING_STYLE.\s(CVS\s6017)
-D 2008-12-11T02:56:07
+C Removed\sa\sfew\smore\sharmless\swarnings\sfrom\sMSVC.\s(CVS\s6018)
+D 2008-12-11T02:58:27
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in f7e4c81c347b04f7b0f1c1b081a168645d7b8af7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -138,7 +138,7 @@ F src/os.h 4ee25a35c00e75a569cecb5080be299b0c3e208e
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
 F src/os_unix.c 96b4a6e87335ba943455740f311b4dfb63f26756
-F src/os_win.c d42d591be8669de0ecf3a0433108d31a8eadcbb3
+F src/os_win.c 496e3ceb499aedc63622a89ef76f7af2dd902709
 F src/pager.c 7e8c2b7b7131031cfa88ab0fdbb2de047f5be934
 F src/pager.h 37f5173612b7803f44656c16e80df3280234bb18
 F src/parse.y 3dfd941533cdc6ce0b09b905b25c4eb73858400b
@@ -152,7 +152,7 @@ F src/random.c 676b9d7ac820fe81e6fb2394ac8c10cff7f38628
 F src/resolve.c 18dc9f0df1d60048e012ce6632251063e0dd356a
 F src/rowset.c 2256fa4a928f750e2f3d6fc733523034beceb1d6
 F src/select.c a4316c5e8a417687e159b3d3ae689363d1dec5df
-F src/shell.c 255762876786ed3a915b45e789652371e2bbeac5
+F src/shell.c 60638e2fdfe97f1eb9c18caf87d3744d8269d012
 F src/sqlite.h.in 619a82b485fbf02276ecb8b1cc629f0c8bcda4ca
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
 F src/sqliteInt.h a1478d1ec40bca0b511c06e2b4c93dc932aa3426
@@ -194,7 +194,7 @@ F src/update.c 080889d241e4dcd1c545c8051eb6de86f4939295
 F src/utf.c 1da9c832dba0fa8f865b5b902d93f420a1ee4245
 F src/util.c ea62608f66f33a7e8322de83024ae37c415c0c7f
 F src/vacuum.c 383d6297bddc011ab04a9eed110db6eaf523e8e9
-F src/vdbe.c 99e6c72bd385b208f67a654a6dfaf62d5d1b9ab1
+F src/vdbe.c 4b004af10e5dcc5f321cf04ff2688a221443d393
 F src/vdbe.h 03516f28bf5aca00a53c4dccd6c313f96adb94f6
 F src/vdbeInt.h e6e80a99ce634983b7cc2498843b4d2e5540900a
 F src/vdbeapi.c 85c33cfbfa56249cbe627831610afafba754477d
@@ -664,7 +664,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 76c8f6ba87f333f15444ba5444bc675ec4cfd89e
-R 531940807c37b4def476c14a49838111
-U drh
-Z fa3c07b59ee479e86fa6ede14fabbca0
+P 561d5de16ec07546a3bb691f308fb2495a0d0a43
+R 4cda361f32af13256a1f575246a8d36b
+U shane
+Z d3d1337e638ac64496629d95f970a26f

diff --git a/manifest.uuid b/manifest.uuid
index 499b2836634626d2d36d2d06af37f46ed402cb6d..e0623b7218fcad64db6d8430add1ef972722b077 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-561d5de16ec07546a3bb691f308fb2495a0d0a43
\ No newline at end of file
+72fd92bd67ed2b8e193cf3119e60d0a8f1e819c9
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index c26f702952d8355e5ccc459534c8c6e92e8ef975..8d4f1e81c4bcda70330153186972a4a96db7e147 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -12,7 +12,7 @@
 **
 ** This file contains code that is specific to windows.
 **
-** $Id: os_win.c,v 1.144 2008/12/10 22:30:25 shane Exp $
+** $Id: os_win.c,v 1.145 2008/12/11 02:58:27 shane Exp $
 */
 #include "sqliteInt.h"
 #if SQLITE_OS_WIN               /* This file is used for windows only */
@@ -749,7 +749,9 @@ static int winSync(sqlite3_file *id, int flags){
   UNUSED_PARAMETER(id);
 #endif
   OSTRACE3("SYNC %d lock=%d\n", pFile->h, pFile->locktype);
-#ifdef SQLITE_TEST
+#ifndef SQLITE_TEST
+  UNUSED_PARAMETER(flags);
+#else
   if( flags & SQLITE_SYNC_FULL ){
     sqlite3_fullsync_count++;
   }

diff --git a/src/shell.c b/src/shell.c
index bb0e5a524f23fbd661010eb88054df9fca96b9c1..493905032a55f62c79b952e084a93d7c3f77036c 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.194 2008/12/10 22:30:25 shane Exp $
+** $Id: shell.c,v 1.195 2008/12/11 02:58:27 shane Exp $
 */
 #if defined(_WIN32) || defined(WIN32)
 /* This needs to come before any includes for MSVC compiler */
@@ -1007,7 +1007,8 @@ static void open_db(struct callback_data *p){
 **    \\    -> backslash
 */
 static void resolve_backslashes(char *z){
-  int i, j, c;
+  int i, j;
+  char c;
   for(i=j=0; (c = z[i])!=0; i++, j++){
     if( c=='\\' ){
       c = z[++i];
@@ -1041,7 +1042,7 @@ static int booleanValue(char *zArg){
   int val = atoi(zArg);
   int j;
   for(j=0; zArg[j]; j++){
-    zArg[j] = tolower(zArg[j]);
+    zArg[j] = (char)tolower(zArg[j]);
   }
   if( strcmp(zArg,"on")==0 ){
     val = 1;
@@ -1470,7 +1471,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     data.mode = MODE_Semi;
     if( nArg>1 ){
       int i;
-      for(i=0; azArg[1][i]; i++) azArg[1][i] = tolower(azArg[1][i]);
+      for(i=0; azArg[1][i]; i++) azArg[1][i] = (char)tolower(azArg[1][i]);
       if( strcmp(azArg[1],"sqlite_master")==0 ){
         char *new_argv[2], *new_colv[2];
         new_argv[0] = "CREATE TABLE sqlite_master (\n"

diff --git a/src/vdbe.c b/src/vdbe.c
index 4ef333b71571f706aea803744f820398050bebbf..76f64b46bbbde823cacb088f1d317ad3d5190c3a 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.796 2008/12/10 22:32:56 drh Exp $
+** $Id: vdbe.c,v 1.797 2008/12/11 02:58:27 shane Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2421,7 +2421,7 @@ case OP_AutoCommit: {
       sqlite3RollbackAll(db);
       db->autoCommit = 1;
     }else{
-      db->autoCommit = desiredAutoCommit;
+      db->autoCommit = (u8)desiredAutoCommit;
       if( sqlite3VdbeHalt(p)==SQLITE_BUSY ){
         p->pc = pc;
         db->autoCommit = (u8)(1-desiredAutoCommit);