Clear MSVC warnings and fix a typedef issue with MSVC build.

FossilOrigin-Name: b0cb4cfceaa45c31c217e8e0edf4b1431f5e1bd05f85d49528792d69bdbdd6dc

diff --git a/manifest b/manifest
index 0781a282d0439ae9985caa064f32748495d3b872..1454e69a076918fe93463b707c7932188f5c1688 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\sdoc\stweaks,\sone\steensy\senhancement,\sand\sa\snew\sfeature\sbug\sfix
-D 2023-06-16T02:18:59.017
+C Clear\sMSVC\swarnings\sand\sfix\sa\stypedef\sissue\swith\sMSVC\sbuild.
+D 2023-06-16T19:45:55.241
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -639,12 +639,12 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c d6c4354f8ea0dc06962fbabc4b68c4471a45276a2918c929be00f9f537f69eb1
 F src/printf.c b9320cdbeca0b336c3f139fd36dd121e4167dd62b35fbe9ccaa9bab44c0af38d
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
-F src/resmanage.c 12786472cdecfd3a60f519009fb4d01b1735ef75b329088f86ae25b598a4d7ae
-F src/resmanage.h eb801fdd1d49ed6c44bb103d6e077a2835d7592cf0c20af6b2f0d8eaeb42b345
+F src/resmanage.c b85f77821ea0280c73a6afc1dc3b6884ba3a402515c6bf27ba1567408e4f121d
+F src/resmanage.h eb63130e49d7b696a33c6d39d1c437a050bbef42b4f6f4405a15fc563c7dd61e
 F src/resolve.c c1457b920aeb33ed106bf478fad31b7473a8950a755ea898980c428928f3a514
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 1ddfe4450101c3d4890ecb2d6b97ab80b78764d5a3e7022b171721df1620c419
-F src/shell.c.in 188945e30d1688970ca853c07a4a5bd95657381d01a6b6150e0a9e11fce221c8
+F src/shell.c.in b0cbd5996efa136f5b49f02d9076564866e2486b0c9625df1189111d5bbe4573
 F src/shext_linkage.h 4a686427844d5d2b71f2095cb032280fb262490795f0710487ebbedb3732f1cb
 F src/sqlite.h.in 3076d78836b6dac53b3ab0875fc8fd15bca8077aad4d33c85336e05af6aef8c7
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2052,8 +2052,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1a57af86da17a3da6bb343001c779d4d9d2ff2c1937ded4d6370d6a951c3cda4
-R b6513344e2855361b63c6f2e2dc46ceb
+P 1073ef0629921dbb74719045a742d68d2bb4e28fc5fa6463e725ddd1d9e6e651
+R 92ba1ad3a67160bddd0ea15761c50c4b
 U larrybr
-Z 29b4d969b0d35ef65e922c1adb2b29af
+Z 45983338d46924a7b0c84861d7e1a312
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a5218114e14caecea17383cf1c1ebd840931f7b7..b73491bc152c53c805fb54c0c86ab6346498cf58 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1073ef0629921dbb74719045a742d68d2bb4e28fc5fa6463e725ddd1d9e6e651
\ No newline at end of file
+b0cb4cfceaa45c31c217e8e0edf4b1431f5e1bd05f85d49528792d69bdbdd6dc
\ No newline at end of file

diff --git a/src/resmanage.c b/src/resmanage.c
index 5f3391d0544d03e45c9bc9f3b7c648db15045170..b497504d0d8bd0bf6ba246a74149081f67b2d4c3 100644 (file)
--- a/src/resmanage.c
+++ b/src/resmanage.c
@@ -82,7 +82,6 @@ ResourceMark holder_mark(){
 /* Strip resource stack then strip call stack (or exit.) */
 void quit_moan(const char *zMoan, int errCode){
   RipStackDest *pRSD = pRipStack;
-  int nFreed;
   if( zMoan ){
     fprintf(stderr, "Error: Terminating due to %s.\n", zMoan);
   }

diff --git a/src/resmanage.h b/src/resmanage.h
index 564115f051fecc32563483a97cae935ed441e7cc..5639d0a1a719ff40aa2c2573ec5f3203b4cb609b 100644 (file)
--- a/src/resmanage.h
+++ b/src/resmanage.h
@@ -59,10 +59,10 @@ typedef unsigned short ResourceCount;
 /* Type used to record a possible succession of recovery destinations */
 typedef struct RipStackDest {
   struct RipStackDest *pPrev;
-  ResourceMark resDest;
 #ifndef SHELL_OMIT_LONGJMP
   jmp_buf exeDest;
 #endif
+  ResourceMark resDest;
 } RipStackDest;
 #define RIP_STACK_DEST_INIT {0}
 

diff --git a/src/shell.c.in b/src/shell.c.in
index 47eea62a4b1aaa2bdeceff0701b7555f334b1308..653e1c1bcc5f02fbbeadeb6ca5cfeba0d634a8c3 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -64,6 +64,7 @@
 #pragma warning(disable : 4244)
 #pragma warning(disable : 4305)
 #pragma warning(disable : 4306)
+#pragma warning(disable : 4324)
 #pragma warning(disable : 4702)
 #pragma warning(disable : 4706)
 #endif /* defined(_MSC_VER) */
@@ -99,9 +100,11 @@
 #include <stdio.h>
 #include <assert.h>
 #include <math.h>
+#include <stdint.h>
 #include "sqlite3.h"
 typedef sqlite3_int64 i64;
 typedef sqlite3_uint64 u64;
+typedef uint32_t u32;
 typedef unsigned char u8;
 typedef unsigned short u16;
 #if SQLITE_USER_AUTHENTICATION
@@ -5683,7 +5686,6 @@ static int run_schema_dump_query(
       rc = SQLITE_CORRUPT;
     }
   }
- bail:
   RESOURCE_FREE(mark);
   return rc;
 }
@@ -9785,7 +9787,7 @@ DISPATCHABLE_COMMAND( databases 2 1 0 ){
   int nName = 0;
   sqlite3_stmt *pStmt = 0;
   sqlite3 *db = open_db(p, 0);
-  int i;
+
   rc = s3_prepare_v2_noom(db, "PRAGMA database_list", -1, &pStmt, 0);
   stmt_holder(pStmt);
   if( rc || pStmt==0 ){
@@ -11442,7 +11444,7 @@ DISPATCHABLE_COMMAND( mode ? 1 0 ){
   ShellInState *psi = ISS(p);
   const char *zTabname = 0;
   const char *zArg;
-  int i, aix;
+  int aix;
   u8 foundMode = MODE_COUNT_OF, setMode = MODE_COUNT_OF;
   ColModeOpts cmOpts = ColModeOpts_default;
   for(aix=1; aix<nArg; aix++){
@@ -11500,7 +11502,7 @@ DISPATCHABLE_COMMAND( mode ? 1 0 ){
       raw_printf(out, "current output mode: %s\n", zMode);
     }
 #else
-    i = psi->mode;
+    int i = psi->mode;
     assert(i>=0 && i<MODE_COUNT_OF);
     zMode = modeDescr[i].zModeName;
     /* Mode not specified. Show present mode (and toss any options set.) */
@@ -12231,8 +12233,8 @@ static void list_pov_entries(ShellExState *psx, ParamTableUse ptu, u8 bShort,
       sqlite3_bind_int(pStmt, 1, ptu);
       while( rc==SQLITE_OK && s3_step_noom(pStmt)==SQLITE_ROW ){
         ParamTableUse ptux = sqlite3_column_int(pStmt,1);
-        const char *zName = sqlite3_column_text(pStmt,0);
-        const char *zValue = sqlite3_column_text(pStmt,2);
+        const char *zName = (const char*)sqlite3_column_text(pStmt,0);
+        const char *zValue = (const char*)sqlite3_column_text(pStmt,2);
         if( !zName ) zName = "?";
         if( !zValue ) zValue = "?";
         switch( ptux ){
@@ -13609,7 +13611,6 @@ DISPATCHABLE_COMMAND( show ? 1 1 ){
   const char *zOut;
   ShellInState *psi = ISS(p);
   FILE *out = psi->out;
-  int i;
 
   utf8_printf(out, "%12.12s: %s\n","echo",
               azBool[ShellHasFlag(p, SHFLG_Echo)]);
@@ -16819,8 +16820,8 @@ typedef struct ArgsData {
 static int scanInvokeArgs(int argc, char **argv, int pass, ShellInState *psi,
                           CmdArgs *pcaCmd, CmdArgs *pcaBare, ArgsData *pad){
   int rc = 0;
-  DotCmdRC drc;
   int i;
+
   if( pass==1 ){
     for(i=1; i<argc && rc<2; i++){
       char *z = argv[i];