From: drh <drh@noemail.net>
Date: Mon, 1 Aug 2016 17:06:44 +0000 (+0000)
Subject: Fix other harmless compiler warnings.
X-Git-Tag: version-3.14.0~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0df540d7a5537ba239d00911444096474f28ed0;p=thirdparty%2Fsqlite.git

Fix other harmless compiler warnings.

FossilOrigin-Name: 90d2c490fc2ed4e073711b84f989ca4d496dcfb5
---

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index a9452b0191..61c52ebe61 100644
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -1223,6 +1223,7 @@ static void jsonQuoteFunc(
   sqlite3_value **argv
 ){
   JsonString jx;
+  UNUSED_PARAM(argc);
 
   jsonInit(&jx, ctx);
   jsonAppendValue(&jx, argv[0]);
diff --git a/manifest b/manifest
index 12abe5c148..fc5ee826f4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sduplicate\stypedef\sfrom\sloadext.c\s(remaining\scopy\sis\sin\ssqlite3ext.h).
-D 2016-08-01T16:57:30.301
+C Fix\sother\sharmless\scompiler\swarnings.
+D 2016-08-01T17:06:44.553
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233
@@ -212,7 +212,7 @@ F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
 F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
-F ext/misc/json1.c d51a764ba43a49e191bc3536238bfab3def258ca
+F ext/misc/json1.c 9799e4252b305edcbe659329eec3ca80ed85f968
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
 F ext/misc/percentile.c 92699c8cd7d517ff610e6037e56506f8904dae2e
 F ext/misc/regexp.c a68d25c659bd2d893cd1215667bbf75ecb9dc7d4
@@ -347,7 +347,7 @@ F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
 F src/insert.c 8f4e9fcbd8e95e85f15647ba8b413b18d556ec2b
 F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
-F src/loadext.c ab2870487f4313a69816f15cb66d6c116051d895
+F src/loadext.c dd7a2b77902cc66c22555aef02e1a682554b7aec
 F src/main.c 16c1b2114eae8804caf3a8de8cb47bf2c6d83ad3
 F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
@@ -384,7 +384,7 @@ F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
-F src/shell.c 9351fc6de11e1d908648c0a92d85627138e3dee5
+F src/shell.c 79dda477be6c96eba6e952a934957ad36f87acc7
 F src/sqlite.h.in b41cf2d1deb59db570f20e8ed7ade4716c6dc613
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
@@ -1508,7 +1508,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 e57fa6af32a1d1bf7be64b26850730f7e714b6c6
-R 95d57e7a20ef51e72dadff0e39b4eac0
-U dan
-Z dd3eec4e4b9fe5243b233856e0e2f91d
+P fd184e5a8f4577aa9a817eb55e771d8d1021b946
+R ee6ea998e955e1020bf52b2850224f49
+U drh
+Z 082f7342c6c06c2add554ab4b05f638a
diff --git a/manifest.uuid b/manifest.uuid
index 564b2f8413..0a3df4be92 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fd184e5a8f4577aa9a817eb55e771d8d1021b946
\ No newline at end of file
+90d2c490fc2ed4e073711b84f989ca4d496dcfb5
\ No newline at end of file
diff --git a/src/loadext.c b/src/loadext.c
index c2125f35e2..9feabbd045 100644
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -684,7 +684,7 @@ int sqlite3_auto_extension(
     wsdAutoextInit;
     sqlite3_mutex_enter(mutex);
     for(i=0; i<wsdAutoext.nExt; i++){
-      if( wsdAutoext.aExt[i]==(void*)xInit ) break;
+      if( wsdAutoext.aExt[i]==xInit ) break;
     }
     if( i==wsdAutoext.nExt ){
       u64 nByte = (wsdAutoext.nExt+1)*sizeof(wsdAutoext.aExt[0]);
@@ -694,7 +694,7 @@ int sqlite3_auto_extension(
         rc = SQLITE_NOMEM_BKPT;
       }else{
         wsdAutoext.aExt = aNew;
-        wsdAutoext.aExt[wsdAutoext.nExt] = (void*)xInit;
+        wsdAutoext.aExt[wsdAutoext.nExt] = xInit;
         wsdAutoext.nExt++;
       }
     }
@@ -724,7 +724,7 @@ int sqlite3_cancel_auto_extension(
   wsdAutoextInit;
   sqlite3_mutex_enter(mutex);
   for(i=(int)wsdAutoext.nExt-1; i>=0; i--){
-    if( wsdAutoext.aExt[i]==(void*)xInit ){
+    if( wsdAutoext.aExt[i]==xInit ){
       wsdAutoext.nExt--;
       wsdAutoext.aExt[i] = wsdAutoext.aExt[wsdAutoext.nExt];
       n++;
diff --git a/src/shell.c b/src/shell.c
index e8d215b95a..18c6ef7197 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -2550,6 +2550,8 @@ static int sql_trace_callback(
   void *pX
 ){
   FILE *f = (FILE*)pArg;
+  UNUSED_PARAMETER(mType);
+  UNUSED_PARAMETER(pP);
   if( f ){
     const char *z = (const char*)pX;
     int i = (int)strlen(z);