From: mistachkin <mistachkin@noemail.net>
Date: Sat, 18 Jan 2020 19:02:20 +0000 (+0000)
Subject: Fix harmless compiler warning seen with MSVC.
X-Git-Tag: version-3.31.0~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=591711751e2c8f42acf223ea99afad52128ba9ac;p=thirdparty%2Fsqlite.git

Fix harmless compiler warning seen with MSVC.

FossilOrigin-Name: cd0437ba5b13593ebe4ec30d6236623183f8cfa30ca8a0612662eccb282a863e
---

diff --git a/manifest b/manifest
index a7b439b8bf..42865a4334 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sextra\sfront\smargin\sto\sthe\sfake\sempty\sfilename\sreturned\sby\nsqlite3PagerFilename()\sfor\san\sin-memory\sor\sTEMP\sdatabase.
-D 2020-01-18T14:50:06.802
+C Fix\sharmless\scompiler\swarning\sseen\swith\sMSVC.
+D 2020-01-18T19:02:20.512
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -603,7 +603,7 @@ F src/upsert.c 2920de71b20f04fe25eb00b655d086f0ba60ea133c59d7fa3325c49838818e78
 F src/utf.c 736ff76753236ffbc8b5b939f5e0607f28aeaa7c780b3a56b419228f0a81c87b
 F src/util.c d035b09df9cecbc0e8f07c34b815acbf0d43c8adc8d2c540e3dc92eecb27855a
 F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
-F src/vdbe.c 562acbbe042b8ebff4a676870c242eaa3d3c3bf1967ed76e88f56adebd88aac5
+F src/vdbe.c e3dd230ece613409507523e68436764cc20638bb77ba2f416097de5b37235ce1
 F src/vdbe.h defd693289c7bb8d325f109be9490c77138061211a116827da7244b6015a4934
 F src/vdbeInt.h 30d3e8b991547cdf39025e416a0a737b0416d46747af70ae058f60e2e0466fe7
 F src/vdbeapi.c 1252d80c548711e47a6d84dae88ed4e95d3fbb4e7bd0eaa1347299af7efddf02
@@ -1857,7 +1857,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 a1be6ee0188911448c064e2c25fb0ca1daad50f3d50fb49a34430bd09736b4a9
-R 0a585b2e54cceb8bd02bf68727c1a877
-U drh
-Z f5bf42617ec17bfaad2139412ca6e04d
+P fee945671a19a93287f9bfadc346f9821fb1311c7fc75b95a6a48d1419c840e7
+R 7bbc575165e9b40bddc3ed0e01914017
+U mistachkin
+Z 29a5be4714ea18aa44a20b20a4026bdd
diff --git a/manifest.uuid b/manifest.uuid
index 9b9f4852aa..9130892347 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fee945671a19a93287f9bfadc346f9821fb1311c7fc75b95a6a48d1419c840e7
\ No newline at end of file
+cd0437ba5b13593ebe4ec30d6236623183f8cfa30ca8a0612662eccb282a863e
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index b885f14a5b..b9d2d12505 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -514,7 +514,7 @@ void sqlite3VdbeMemPrettyPrint(Mem *pMem, StrAccum *pStr){
     }
   }else if( f & MEM_Str ){
     int j;
-    int c;
+    u8 c;
     if( f & MEM_Dyn ){
       c = 'z';
       assert( (f & (MEM_Static|MEM_Ephem))==0 );
@@ -529,7 +529,7 @@ void sqlite3VdbeMemPrettyPrint(Mem *pMem, StrAccum *pStr){
     }
     sqlite3_str_appendf(pStr, " %c%d[", c, pMem->n);
     for(j=0; j<25 && j<pMem->n; j++){
-      u8 c = pMem->z[j];
+      c = pMem->z[j];
       sqlite3_str_appendchar(pStr, 1, (c>=0x20&&c<=0x7f) ? c : '.');
     }
     sqlite3_str_appendf(pStr, "]%s", encnames[pMem->enc]);