Fix harmless compiler warnings.

FossilOrigin-Name: b3b7b42d9a4a0e7e2be8b2933328a7bec2f49a81

diff --git a/manifest b/manifest
index 1a6c1dd87945db33bc5e09fbb0a7923440114a94..82825d767944adb2f06310307570c0d6198ea718 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Prevent\sa\spossible\suse-after-free\sbug\sin\sthe\squery\soptimizer.
-D 2016-11-20T12:00:27.508
+C Fix\sharmless\scompiler\swarnings.
+D 2016-11-20T17:59:59.686
 F Makefile.in 6b572807415d3f0a379cebc9461416d8df4a12c8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc bb4d970894abbbe0e88d00aac29bd52af8bc95f4
@@ -349,7 +349,7 @@ F src/hash.c 63d0ee752a3b92d4695b2b1f5259c4621b2cfebd
 F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c 0d6e59f9eea62db772eabc0f07901ec26fe01968
+F src/insert.c 24a42864ae46e4448d15f3207af963a6452b611e
 F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d
 F src/main.c 694ac90557abdaa62151a6090670e107b0f2c2ab
@@ -388,7 +388,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 672b1af237ad257149fc5189f3277dcbca036eeb
-F src/shell.c f04e4af75c5517735397d060ed0b4a874104bb41
+F src/shell.c b6ba45f741cc0e56ec7a3504855fe1373def2e16
 F src/sqlite.h.in 803f7050f69b2eea573fac219f3c92582c096027
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
@@ -1534,7 +1534,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 d6b3779e6dad038d8bc35139cf314bf1e6e91977
-R 830f3978b6b30c614984da775063fd9f
+P 0a98c8d76ac86412d5eb68de994658c250989349
+R 38b98996abd27ed143b71be3145a6356
 U drh
-Z d214ac5b563755a186f4bc035514a8e0
+Z ab3b36c0e8942c1f47487ebf38a820ad

diff --git a/manifest.uuid b/manifest.uuid
index 3e43a5563dc81b5bbcd35b7a2c28bb179a5fa248..90143d3d06f625f47d755ce69cdf0f64000bdeef 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0a98c8d76ac86412d5eb68de994658c250989349
\ No newline at end of file
+b3b7b42d9a4a0e7e2be8b2933328a7bec2f49a81
\ No newline at end of file

diff --git a/src/insert.c b/src/insert.c
index f7c7bed540e9eb68990147c1d493c08ba60474ba..11b7221714d5cfe042506e1a6b940dbc93f185ba 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -786,7 +786,6 @@ void sqlite3Insert(
   /* If this is not a view, open the table and and all indices */
   if( !isView ){
     int nIdx;
-    Index *pIdx;
     nIdx = sqlite3OpenTableAndIndices(pParse, pTab, OP_OpenWrite, 0, -1, 0,
                                       &iDataCur, &iIdxCur);
     aRegIdx = sqlite3DbMallocRawNN(db, sizeof(int)*(nIdx+1));

diff --git a/src/shell.c b/src/shell.c
index aaba1080e43dc230a57e45040a6ba916d1b72f22..1cc4cc223062d3493a51e2419f8d52dd98e69cd6 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -2583,6 +2583,8 @@ static FILE *output_file_open(const char *zFile){
   return f;
 }
 
+#if !defined(SQLITE_OMIT_BUILTIN_TEST)
+#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
 /*
 ** A routine for handling output from sqlite3_trace().
 */
@@ -2603,6 +2605,8 @@ static int sql_trace_callback(
   }
   return 0;
 }
+#endif
+#endif
 
 /*
 ** A no-op routine that runs with the ".breakpoint" doc-command.  This is