From: drh <drh@noemail.net>
Date: Thu, 15 Jun 2017 13:07:56 +0000 (+0000)
Subject: Fix harmless compiler warnings in the shell.c file
X-Git-Tag: version-3.20.0~195
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90cdec067201d6e45d5b82d641279795ca02de82;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings in the shell.c file

FossilOrigin-Name: 9afd7a2ffd3a39456190ad05e85ff6485298aae262d9e0698a58c1d73507a36f
---

diff --git a/manifest b/manifest
index bce2fd980f..e98acb5f54 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sthe\s".tables"\scommand\sin\sthe\scommand-line\sshell\sso\sthat\nit\sshows\sthe\sname\sof\sall\sschemas\sif\sthe\sname\sis\sanything\sother\sthan\s"main".
-D 2017-06-15T12:50:47.020
+C Fix\sharmless\scompiler\swarnings\sin\sthe\sshell.c\sfile
+D 2017-06-15T13:07:56.351
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -406,7 +406,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c adf3ef9843135b1383321ad751f16f5a40c3f37925154555a3e61653d2a954e8
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 0d2afdbdba5fbc61432c5454a35e0236e7aa4aa3756986a7d51b81a508e8083a
-F src/shell.c 9be3234b47eede8451b791c08f40dfe188b43704733ab47ef882102eb3a8a8ca
+F src/shell.c c45ae9a95faf5a495280bfa2d6b7956c707f347e56eb8b1985c852d152e46894
 F src/sqlite.h.in 67fa8bd29808e7988e0ce36c8d4c6043eb1727f94522fc612687aa5af51931e6
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 58fd0676d3111d02e62e5a35992a7d3da5d3f88753acc174f2d37b774fbbdd28
@@ -1582,7 +1582,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 48e086284a76da10a85315bc992e2294bd4711e35ec5a5abaa16e39a6a69d206
-R f0a1a3360ef0fa824ad1508573cdd91a
+P c7f778b7cee16a1dcebccd256408ee1d08ef2b62e388a9ebba5738a0a89bf3a0
+R 2abdc374b32c7bda232d41622d54318f
 U drh
-Z 8b4c48c5024c7add103abe54a8cb3650
+Z 65a79c7805978f50bb15716d0b6d13ff
diff --git a/manifest.uuid b/manifest.uuid
index 7328249fb2..9e0af2d154 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c7f778b7cee16a1dcebccd256408ee1d08ef2b62e388a9ebba5738a0a89bf3a0
\ No newline at end of file
+9afd7a2ffd3a39456190ad05e85ff6485298aae262d9e0698a58c1d73507a36f
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index 18d36775e0..0c109720a0 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1217,7 +1217,7 @@ static void shellAddSchemaName(
      "TRIGGER",
      "VIRTUAL TABLE"
   };
-  int i = 0, n;
+  int i = 0;
   const char *zIn = (const char*)sqlite3_value_text(apVal[0]);
   const char *zSchema = (const char*)sqlite3_value_text(apVal[1]);
   assert( nVal==2 );
@@ -5818,13 +5818,13 @@ static int do_meta_command(char *zLine, ShellState *p){
         zDiv = " UNION ALL ";
         if( strcmp(zDb, "main")!=0 ){
           appendText(&sSelect, "SELECT shell_add_schema(sql,", 0);
-          appendText(&sSelect, sqlite3_column_text(pStmt, 0), '"');
+          appendText(&sSelect, zDb, '"');
           appendText(&sSelect, ") AS sql, type, tbl_name, name, rowid,", 0);
           appendText(&sSelect, zScNum, 0);
           appendText(&sSelect, " AS snum, ", 0);
           appendText(&sSelect, zDb, '\'');
           appendText(&sSelect, " AS sname FROM ", 0);
-          appendText(&sSelect, sqlite3_column_text(pStmt, 0), '"');
+          appendText(&sSelect, zDb, '"');
           appendText(&sSelect, ".sqlite_master", 0);
         }else{
           appendText(&sSelect, "SELECT sql, type, tbl_name, name, rowid, ", 0);