Fix harmless compiler warnings in the shell.

FossilOrigin-Name: a786829783ef65ef270ca360712364cbd47a540d31ed1547d50808aad698bea7

diff --git a/manifest b/manifest
index 834fc1ba0fbd85558b1ec67e50b8e5ef0391bf0c..560760071c2a2446ea78dc21c953ae32719814c2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C New\ssimplified\smemory\sinitialization\sfor\sMacOS.
-D 2017-03-21T20:17:24.121
+C Fix\sharmless\scompiler\swarnings\sin\sthe\sshell.
+D 2017-03-22T12:51:34.759
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a
@@ -402,7 +402,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 3e518b962d932a997fae373366880fc028c75706
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 2496d0cc6368dabe7ad2e4c7f5ed3ad9aa3b4d11cd90f33fa1d1ef72493f43aa
-F src/shell.c 77054c021069ec0b65d3d620aab031f97c59b4e42ac7c31544ea68933b581104
+F src/shell.c ce39c4bbbaa02484cb45141034fd363c3bac80a6aa22b0bb3cecea1c6a4c0979
 F src/sqlite.h.in 723107d97f2345a7c103632169dc61366121c4ab65d75a7d83c6dc0e5bbe5ca4
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
@@ -1567,7 +1567,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 ad741976c8c29bcc94f9ea9ed7deb580bb00c8a81d1a7fba1a4e03849728433d
-R c272fa429602630b64ee19437bd8d503
+P 055b36f1c1593bb123f7319a07c476143d71af052b5b8d34afcd0d500f197882
+R 1f280e53b7c950d24565e873ae0276ec
 U drh
-Z a3a73b80a262fb4daeb6a94d5a29c210
+Z a154993c25ee99ce8fe87b6f82cb272d

diff --git a/manifest.uuid b/manifest.uuid
index e5a19cd1b9ae203aa713462ade8c3ddf2cb19108..6c408aa2514a77a0d04465b587af945fe4bad813 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-055b36f1c1593bb123f7319a07c476143d71af052b5b8d34afcd0d500f197882
\ No newline at end of file
+a786829783ef65ef270ca360712364cbd47a540d31ed1547d50808aad698bea7
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index e7652f8e6707137f2e66aa6ce141ac7ecadaaf50..e71c34e6dff95167caa5ded68a64639e1fd629ce 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -2926,7 +2926,6 @@ static char **tableColumnList(ShellState *p, const char *zTab){
         ** ordinary column in the table.  Verify that azRowid[j] is a valid
         ** name for the rowid before adding it to azCol[0].  WITHOUT ROWID
         ** tables will fail this last check */
-        int rc;
         rc = sqlite3_table_column_metadata(p->db,0,zTab,azRowid[j],0,0,0,0,0);
         if( rc==SQLITE_OK ) azCol[0] = azRowid[j];
         break;
@@ -2959,14 +2958,14 @@ static void toggleSelectOrder(sqlite3 *db){
 ** the table type ("index" or "table") and SQL to create the table.
 ** This routine should print text sufficient to recreate the table.
 */
-static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
+static int dump_callback(void *pArg, int nArg, char **azArg, char **azNotUsed){
   int rc;
   const char *zTable;
   const char *zType;
   const char *zSql;
   ShellState *p = (ShellState *)pArg;
 
-  UNUSED_PARAMETER(azCol);
+  UNUSED_PARAMETER(azNotUsed);
   if( nArg!=3 ) return 1;
   zTable = azArg[0];
   zType = azArg[1];