From: drh <drh@noemail.net>
Date: Thu, 29 Dec 2016 19:48:46 +0000 (+0000)
Subject: Fix harmless compiler warnings in the command-line shell and in Lemon.
X-Git-Tag: version-3.16.0~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96ada59cbb25b37a73618016c8af6b39af005295;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings in the command-line shell and in Lemon.

FossilOrigin-Name: afcdc4a60e357d171156e0de705bf7ad1b37daab
---

diff --git a/manifest b/manifest
index ee9eb6e447..aa299106eb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\skvtest.c,\suse\sstat()\sinstead\sof\sfseek()/ftell()\sto\sdetermine\sthe\ssize\sof\na\sBLOB\sto\sbe\sread\sdirectly\sfrom\sdisk.\s\sThis\smakes\sthe\spile-of-files\sdatabase\nmore\scompetative\sagainst\sSQLite.
-D 2016-12-29T17:25:06.872
+C Fix\sharmless\scompiler\swarnings\sin\sthe\scommand-line\sshell\sand\sin\sLemon.
+D 2016-12-29T19:48:46.056
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -389,7 +389,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c dfb6cadc3dcfba1b1bdbfba62ebba2b4b673413e
-F src/shell.c 48ab675e5526903d2b7bea8c9736cafa345544e1
+F src/shell.c 6095531aa900decdaa765e0f3993fba7153c92c1
 F src/sqlite.h.in e8e2d108d82647f0a812fdb74accf91c1ec08ddc
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
@@ -1467,7 +1467,7 @@ F tool/fuzzershell.c dbf6c26eef936ec78cb0707570de3a4308b2507e
 F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
-F tool/lemon.c e4fb7d888873ac88f20a41c84a7d1e61f5209a6d
+F tool/lemon.c 5ccba178a8e8a4b21e1c9232944d23973da38ad7
 F tool/lempar.c 320d630b44da693407684c64d9fa91a163419dac
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
@@ -1540,7 +1540,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 8074d59cf177cb91ee371e2660f2c59ce540b7e2
-R 753a90b01c338f55ad8c1b7fed642932
+P a7dca29f03e037fe71cc600db97f8058e3bd28a4
+R a5cb3a1af480c7a18023eb7f338349d2
 U drh
-Z 3b88de21d40c4e92a72ebab5ce816139
+Z e569fcc83d59a51062b98f5f55226d42
diff --git a/manifest.uuid b/manifest.uuid
index 52db41a773..40f4cfbe72 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a7dca29f03e037fe71cc600db97f8058e3bd28a4
\ No newline at end of file
+afcdc4a60e357d171156e0de705bf7ad1b37daab
\ No newline at end of file
diff --git a/src/shell.c b/src/shell.c
index ae833d767a..b0928ce792 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -3292,7 +3292,7 @@ static void shellFkeyCollateClause(
   const char *zParentSeq;
   const char *zChild;
   const char *zChildCol;
-  const char *zChildSeq;
+  const char *zChildSeq = 0;  /* Initialize to avoid false-positive warning */
   int rc;
   
   assert( nVal==4 );
@@ -3500,7 +3500,7 @@ static int lintDotCommand(
   int nArg                        /* Number of entries in azArg[] */
 ){
   int n;
-  n = (nArg>=2 ? strlen(azArg[1]) : 0);
+  n = (nArg>=2 ? (int)strlen(azArg[1]) : 0);
   if( n<1 || sqlite3_strnicmp(azArg[1], "fkey-indexes", n) ) goto usage;
   return lintFkeyIndexes(pState, azArg, nArg);
 
diff --git a/tool/lemon.c b/tool/lemon.c
index 0fa3d63b4e..aa0f4e3e9c 100644
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -4159,7 +4159,6 @@ void ReportTable(
   */
   for(rp=lemp->rule; rp; rp=rp->next) rp->doesReduce = LEMON_FALSE;
   for(i=0; i<lemp->nxstate; i++){
-    struct action *ap;
     for(ap=lemp->sorted[i]->ap; ap; ap=ap->next){
       if( ap->type==REDUCE || ap->type==SHIFTREDUCE ){
         ap->x.rp->doesReduce = i;