Fix compiler warnings on Windows.

FossilOrigin-Name: 4978ee8b5405f958723b4ebbd4288bd08bff2b453da2d1c032d1ae904c2a3821

diff --git a/manifest b/manifest
index 781914daf5d389b1d2d4c3172553dc6ccaa6087e..198cadc5b66317cc22b3f4f59c55d826d5c34594 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\stester.tcl\s--malloctrace\soption\sso\sthat\sit\suses\seu-addr2line\sinstead\sof\saddr2line.
-D 2019-02-05T16:53:26.720
+C Fix\scompiler\swarnings\son\sWindows.
+D 2019-02-05T19:48:46.307
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 178d8eb6840771149cee40b322d1b3be30d330198c522c903c1b66fb5a1bfca4
@@ -515,7 +515,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c c8f207247472c41ac73d738e1c1a80719ad253d1dbb617ed57740492b2a6c097
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 8e22fda41a737c391e8b797f7c71e7ded1d107c31181b07bb10b3d4f22a28cd9
-F src/shell.c.in 72a09544a79ac9cb799eeb5a2e15de26e3921b78aa5610c525c4295f1580bf4e
+F src/shell.c.in b5149a7d195b27672a1bc24620e12bfde0bde4436942c726f34889c7c0307271
 F src/sqlite.h.in 7da74fd5bd7a9dbe92297060f036935520b26e240457287c5e67c7b9db51a986
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
@@ -1804,7 +1804,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 d840e9bb023a1e84a7739d764a0f6cf608fc3183ff8c366fcdb486ebd932f0c1
-R ea7e86862ddb85c5a7b59ce084622209
-U dan
-Z 8eeb937aab4d4557109f58c2979ba7c0
+P 79c073878d56fc638b751b0e61295df182f7ee6f8ebd7319c1eeac1608abbac8
+R 849c0b19a8b86343d05866d0b31e75f5
+U drh
+Z 1e1bbef1183a4378ceff05350a8de166

diff --git a/manifest.uuid b/manifest.uuid
index 61b5861a1361598477036cf36220974de7238c76..d948e666134fbaf1153c878fcb2c19730b6c540a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-79c073878d56fc638b751b0e61295df182f7ee6f8ebd7319c1eeac1608abbac8
\ No newline at end of file
+4978ee8b5405f958723b4ebbd4288bd08bff2b453da2d1c032d1ae904c2a3821
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 7295a7374aaad0adb1ad111f4762f909ec364fd9..07292444f28432d25507cd3db0838bb2a4ef48bf 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1086,11 +1086,11 @@ struct ShellState {
 #define SHELL_TRACE_NORMALIZED 2      /* Show normalized SQL text */
 
 /* Bits in the ShellState.flgProgress variable */
-#define PROGRESS_QUIET   0x01         /* Omit announcing every progress callback */
-#define PROGRESS_RESET   0x02         /* Reset the count when the progres
-                                      ** callback limit is reached, and for each
-                                      ** top-level SQL statement */
-#define PROGRESS_ONCE    0x04         /* Cancel the --limit after firing once */
+#define SHELL_PROGRESS_QUIET 0x01  /* Omit announcing every progress callback */
+#define SHELL_PROGRESS_RESET 0x02  /* Reset the count when the progres
+                                   ** callback limit is reached, and for each
+                                   ** top-level SQL statement */
+#define SHELL_PROGRESS_ONCE  0x04  /* Cancel the --limit after firing once */
 
 /*
 ** These are the allowed shellFlgs values
@@ -1800,11 +1800,11 @@ static int progress_handler(void *pClientData) {
   p->nProgress++;
   if( p->nProgress>=p->mxProgress && p->mxProgress>0 ){
     raw_printf(p->out, "Progress limit reached (%u)\n", p->nProgress);
-    if( p->flgProgress & PROGRESS_RESET ) p->nProgress = 0;
-    if( p->flgProgress & PROGRESS_ONCE ) p->mxProgress = 0;
+    if( p->flgProgress & SHELL_PROGRESS_RESET ) p->nProgress = 0;
+    if( p->flgProgress & SHELL_PROGRESS_ONCE ) p->mxProgress = 0;
     return 1;
   }
-  if( (p->flgProgress & PROGRESS_QUIET)==0 ){
+  if( (p->flgProgress & SHELL_PROGRESS_QUIET)==0 ){
     raw_printf(p->out, "Progress %u\n", p->nProgress);
   }
   return 0;
@@ -7035,7 +7035,7 @@ static int do_meta_command(char *zLine, ShellState *p){
 
   if( c=='p' && n>=3 && strncmp(azArg[0], "progress", n)==0 ){
     int i;
-    int n = 0;
+    int nn = 0;
     p->flgProgress = 0;
     p->mxProgress = 0;
     p->nProgress = 0;
@@ -7045,15 +7045,15 @@ static int do_meta_command(char *zLine, ShellState *p){
         z++;
         if( z[0]=='-' ) z++;
         if( strcmp(z,"quiet")==0 || strcmp(z,"q")==0 ){
-          p->flgProgress |= PROGRESS_QUIET;
+          p->flgProgress |= SHELL_PROGRESS_QUIET;
           continue;
         }
         if( strcmp(z,"reset")==0 ){
-          p->flgProgress |= PROGRESS_RESET;
+          p->flgProgress |= SHELL_PROGRESS_RESET;
           continue;
         }
         if( strcmp(z,"once")==0 ){
-          p->flgProgress |= PROGRESS_ONCE;
+          p->flgProgress |= SHELL_PROGRESS_ONCE;
           continue;
         }
         if( strcmp(z,"limit")==0 ){
@@ -7070,11 +7070,11 @@ static int do_meta_command(char *zLine, ShellState *p){
         rc = 1;
         goto meta_command_exit;
       }else{
-        n = (int)integerValue(z);
+        nn = (int)integerValue(z);
       }
     }
     open_db(p, 0);
-    sqlite3_progress_handler(p->db, n, progress_handler, p);
+    sqlite3_progress_handler(p->db, nn, progress_handler, p);
   }else
 
   if( c=='p' && strncmp(azArg[0], "prompt", n)==0 ){
@@ -8412,7 +8412,7 @@ static int runOneSqlLine(ShellState *p, char *zSql, FILE *in, int startline){
 
   open_db(p, 0);
   if( ShellHasFlag(p,SHFLG_Backslash) ) resolve_backslashes(zSql);
-  if( p->flgProgress & PROGRESS_RESET ) p->nProgress = 0;
+  if( p->flgProgress & SHELL_PROGRESS_RESET ) p->nProgress = 0;
   BEGIN_TIMER;
   rc = shell_exec(p, zSql, &zErrMsg);
   END_TIMER;