From: mistachkin <mistachkin@noemail.net>
Date: Tue, 21 Nov 2017 21:14:32 +0000 (+0000)
Subject: Fix compilation issue (C99-ism) in the shell seen with MSVC.
X-Git-Tag: version-3.22.0~185
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6bc15a804eb5a37a1159d2ef7b0e8c12844e44e;p=thirdparty%2Fsqlite.git

Fix compilation issue (C99-ism) in the shell seen with MSVC.

FossilOrigin-Name: 9cb47430553f00216e9b06e3d8226b903da536152fac80a5b6f615508c933252
---

diff --git a/manifest b/manifest
index 3cff6827c1..6b501fa59f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\somit-table-from-left-join\soptimization\sso\sthat\sit\scan\somit\stables\nfrom\sthe\smiddle\sof\sthe\sjoin\sas\swell\sas\sthe\send.
-D 2017-11-21T20:53:14.147
+C Fix\scompilation\sissue\s(C99-ism)\sin\sthe\sshell\sseen\swith\sMSVC.
+D 2017-11-21T21:14:32.355
 F Makefile.in b142eb20482922153ebc77b261cdfd0a560ed05a81e9f6d9a2b0e8192922a1d2
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a55372a22454e742ba7c8f6edf05b83213ec01125166ad7dcee0567e2f7fc81b
@@ -471,7 +471,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bbee7e31d369a18a2f4836644769882e9c5d40ef4a3af911db06410b65cb3730
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 17e220191860a64a18c084141e1a8b7309e166a6f2d42c02021af27ea080d157
-F src/shell.c.in a87f3094c1d2a07ed3f731409b33dbf36faf99157bfedb17855a664c60e1a909
+F src/shell.c.in cb1b5e41ef9c081b2b8927ae32c9c384a9ec110ada808ebfe083ba7c8a19bbb8
 F src/sqlite.h.in 8fd97993d48b50b9bade38c52f12d175942c9497c960905610c7b03a3e4b5818
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34
@@ -1677,8 +1677,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 7fdb1e2ac2040dc47800a224d33a5c95d55200c480d46fedec1e97fb4f089ef7 618ca9fe53d8d2d7b4f368e6ee404d5fceeecac0d689f32ab62af8a6cbb37401
-R 77239b01fe37a025cc689347a6c626c1
-T +closed 618ca9fe53d8d2d7b4f368e6ee404d5fceeecac0d689f32ab62af8a6cbb37401
-U dan
-Z 33c2b988566a650eaa7cbc98ff0c3943
+P 0cd82ee9a8413cf127b5ca65770e3f363bd579941cd592298d3b0c27715583f3
+R 4fa7a7c4266f9577164091bee69af1d6
+U mistachkin
+Z 932ce0ecb18fdaa178b1c4aecbb344e5
diff --git a/manifest.uuid b/manifest.uuid
index 2aded3bcbc..7486e65b91 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0cd82ee9a8413cf127b5ca65770e3f363bd579941cd592298d3b0c27715583f3
\ No newline at end of file
+9cb47430553f00216e9b06e3d8226b903da536152fac80a5b6f615508c933252
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 68a337db11..f41e7438ed 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -5952,8 +5952,10 @@ static int do_meta_command(char *zLine, ShellState *p){
     int rc2 = 0;    /* 0: usage.  1: %d  2: %x  3: no-output */
     int isOk = 0;
     int i, n2;
+    const char *zCmd = 0;
+
     open_db(p, 0);
-    const char *zCmd = nArg>=2 ? azArg[1] : "help";
+    zCmd = nArg>=2 ? azArg[1] : "help";
 
     /* The argument can optionally begin with "-" or "--" */
     if( zCmd[0]=='-' && zCmd[1] ){