Fix compiler warnings on Windows.

FossilOrigin-Name: 512b8e40c4ce2066d230b5f007bd704dc3577e21c55131ef07d90bf2fcf91b40

diff --git a/ext/misc/unionvtab.c b/ext/misc/unionvtab.c
index 14cce84510af6f707ee2c07e59007c4ba5d2c5e5..92d0b833c490242132bf9928c31d69d8a1ea7603 100644 (file)
--- a/ext/misc/unionvtab.c
+++ b/ext/misc/unionvtab.c
@@ -799,7 +799,7 @@ static void unionConfigureVtab(
       zVal = zOpt;
       if( *zVal==':' ) zVal++;
       while( union_isidchar(*zVal) ) zVal++;
-      nOpt = zVal-zOpt;
+      nOpt = (int)(zVal-zOpt);
 
       while( union_isspace(*zVal) ) zVal++;
       if( *zVal=='=' ){

diff --git a/manifest b/manifest
index 77a6b3f32481696fe112af4fbb96f59860b242cc..29c6ed4690c20054f352b17888dee7c9613132eb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\stest\scases\sand\sfixes\sfor\sminor\sproblems.
-D 2018-01-03T23:40:02.979
+C Fix\scompiler\swarnings\son\sWindows.
+D 2018-01-03T23:54:18.421
 F Makefile.in 892bf253c48f3d2d8d4e4e89b44b71aa548a0eba11b148c338690cfb99822859
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 3b7ee2ebaf579fe7d30bece93e61e52782c3ff836455cba3a192f7a8f6f269d6
@@ -293,7 +293,7 @@ F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
 F ext/misc/spellfix.c 41cf26c6b89fcaa8798ae10ae64d39c1f1d9d6995152e545bd491c13058b8fac
 F ext/misc/stmt.c 6f16443abb3551e3f5813bb13ba19a30e7032830015b0f92fe0c0453045c0a11
 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
-F ext/misc/unionvtab.c de36c2c45583d68f99e45b392311967066b02e2651d05697da783698b245b387
+F ext/misc/unionvtab.c 2aa94902ea646e1aaf6c05eac944a14276cddd67735b2ad856030ffffbb6626c
 F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
 F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178
 F ext/misc/vtablog.c 31d0d8f4406795679dcd3a67917c213d3a2a5fb3ea5de35f6e773491ed7e13c9
@@ -480,11 +480,11 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bbee7e31d369a18a2f4836644769882e9c5d40ef4a3af911db06410b65cb3730
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 8b22abe193e4d8243befa2038e4ae2405802fed1c446e5e502d11f652e09ba74
-F src/shell.c.in a418ddceef7a2789f18bdc2bcdd481b2562fe4a7754b8009c8dd33d5a67da332
+F src/shell.c.in 23b0207a222c1a1fcd0a3b9d790c79c0713212d63be94d96c0be0e62ccac3cd0
 F src/sqlite.h.in 95a2e67c1ff46365eef3cb14e73d0b279a7435c0d0fb7e59c89cde9d4353dae2
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
-F src/sqliteInt.h 713ee4be20beddf2f053b3ac1871c1f0d9ab54d1cc21c24a4365b560181b5d7d
+F src/sqliteInt.h 315d863d61ac951d125934bc0946db15e94c61890d93fd6c6ff29c3c9881b39c
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 9737ed017279a9e0c5da748701c3c7bf1e8ae0dae459aad20dd64fcff97a7e35
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1690,7 +1690,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P fa6069fb3b0a4411fd6661dec7de40ece3064a2fe4b94ebfbda9e5e524e04e86
-R 80c4d802a2eb305cbf9b2f9ece314afe
+P e0da2cc382e0db33d0423372133115f52c77bd0093dbf816c7e88a0aad5f6582
+R 3114b544cf591fa5de64b7bed571adcc
 U drh
-Z e7e409e5145088df0792d1925f4056dd
+Z b9d8faa03d64775d21ab162e0db38bba

diff --git a/manifest.uuid b/manifest.uuid
index 069635c8d701ef5d8e93654ee59b7199da5d381d..e191c4096709ba73aacd85009ab9eca2c74ff3b6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e0da2cc382e0db33d0423372133115f52c77bd0093dbf816c7e88a0aad5f6582
\ No newline at end of file
+512b8e40c4ce2066d230b5f007bd704dc3577e21c55131ef07d90bf2fcf91b40
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 4c9e60769ae7f066807ddd716ec0e20b608d3a5e..1421ab4199f0d88bcf71652d374d8f7b3ae43466 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -4272,7 +4272,7 @@ static int expertDotCommand(
     char *z = azArg[i];
     int n;
     if( z[0]=='-' && z[1]=='-' ) z++;
-    n = strlen(z);
+    n = strlen30(z);
     if( n>=2 && 0==strncmp(z, "-verbose", n) ){
       pState->expert.bVerbose = 1;
     }

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 35074ee81a994f03c208a4f9bdc600dab3744ce6..757cfcb994e5eecce804c8e22d47e7f034a9a377 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1365,9 +1365,9 @@ struct sqlite3 {
     int newTnum;                /* Rootpage of table being initialized */
     u8 iDb;                     /* Which db file is being initialized */
     u8 busy;                    /* TRUE if currently initializing */
-    u8 orphanTrigger : 1;       /* Last statement is orphaned TEMP trigger */
-    u8 imposterTable : 1;       /* Building an imposter table */
-    u8 reopenMemdb : 1;         /* ATTACH is really a reopen using MemDB */
+    unsigned orphanTrigger : 1; /* Last statement is orphaned TEMP trigger */
+    unsigned imposterTable : 1; /* Building an imposter table */
+    unsigned reopenMemdb : 1;   /* ATTACH is really a reopen using MemDB */
   } init;
   int nVdbeActive;              /* Number of VDBEs currently running */
   int nVdbeRead;                /* Number of active VDBEs that read or write */