More compiler warning fixes for GCC related to the auto-extension mechanism.

FossilOrigin-Name: b8218129bc848c61fa6910feae4141dac6ad86fc

diff --git a/manifest b/manifest
index 17a1dd2ca9035bb0405c009906bec557c74e2b07..07a36a9f510d728bb15a6298fcb605c3ce030fb4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sreturn\stype\sused\sby\sthe\sauto-extension\sentry\spoints\sis\s'int',\snot\s'void'.
-D 2016-07-28T22:46:53.241
+C More\scompiler\swarning\sfixes\sfor\sGCC\srelated\sto\sthe\sauto-extension\smechanism.
+D 2016-07-28T22:53:10.716
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233
@@ -392,7 +392,7 @@ F src/sqliteInt.h 14516943867eb2c30ce0e3670299958f59ade052
 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
 F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab
 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
-F src/tclsqlite.c 2ca362fa9c9762f705169aa5b2e75d688f4391f7
+F src/tclsqlite.c bdae822f21e229b6daced15938b6343ce44ef454
 F src/test1.c 906a04b649c7139e943193a3905d583e325c30c7
 F src/test2.c b7174313e993754303a8b33c43df7c44b46857ab
 F src/test3.c 1339a40be39650ae83894b6578f971dc7f96ea8a
@@ -412,7 +412,7 @@ F src/test_config.c 4d3d4a886416f369771d69a6dba926866deda788
 F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
 F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58
 F src/test_fs.c ac62ce7d5c0c23aa6932891cad5746945564c91c
-F src/test_func.c 7dceef0e0556933a751af9b73478519b6dc12f0f
+F src/test_func.c 6f34b19ae097e3cf0b0fe5d6904cb9900e67f2ff
 F src/test_hexio.c 1d4469ca61ab202a1fcec6543f584d2407205e8d
 F src/test_init.c 4413c211a94b62157ca4c145b3f27c497f03c664
 F src/test_intarray.c 988fc61cb0ff539f4172c0d95f15287c92516f64
@@ -435,7 +435,7 @@ F src/test_sqllog.c 0d138a8180a312bf996b37fa66da5c5799d4d57b
 F src/test_superlock.c 4839644b9201da822f181c5bc406c0b2385f672e
 F src/test_syscall.c 1073306ba2e9bfc886771871a13d3de281ed3939
 F src/test_tclvar.c df9fe1213c2634687a9ca0b0bec0d2119d359ae3
-F src/test_thread.c a122592c2b857c79eb4ee4bacb62a5a6c8fe4c6f
+F src/test_thread.c 89f0e47dac64e7ab15ca0a4fc87e0882c495ae21
 F src/test_vfs.c f0186261a24de2671d080bcd8050732f0cb64f6e
 F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
 F src/test_windirent.c 8f5fada630348558d5745b334702f301da1ffc61
@@ -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 87ba69b5ca4a8e4ef2bbaaf07a0ff13fc5cd4721
-R fe55b3414e54e3c3fe825e99e626bb4c
+P bf9c86c74f30136a106f37603a6c7dcc76caf41d
+R 664c66de93f8212f17433a2724631f1d
 U mistachkin
-Z 6282b6a783a4676d4515222e105ea01c
+Z 34c982f036e48065c3f321d45916961b

diff --git a/manifest.uuid b/manifest.uuid
index b5a2549c0298ddbcda756bb8168cb9bd154e38ab..2806d535ae7e54f3357040eb0421c32f790ed09b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bf9c86c74f30136a106f37603a6c7dcc76caf41d
\ No newline at end of file
+b8218129bc848c61fa6910feae4141dac6ad86fc
\ No newline at end of file

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index dd4e42e8a98b08a908c59b5d17ab20a020c6e01c..3db4a32c4d14a33db10dfb9403454617d8ccde70 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -3923,7 +3923,7 @@ static void md5finalize(sqlite3_context *context){
 int Md5_Register(
   sqlite3 *db,
   char **pzErrMsg,
-  const void *pThunk
+  const sqlite3_api_routines *pThunk
 ){
   int rc = sqlite3_create_function(db, "md5sum", -1, SQLITE_UTF8, 0, 0,
                                  md5step, md5finalize);

diff --git a/src/test_func.c b/src/test_func.c
index fff1990128a92548c3929a52212588ec26a4a79b..6bfa86246403fce1f84d3dae96d5c3c7c14ba0b5 100644 (file)
--- a/src/test_func.c
+++ b/src/test_func.c
@@ -647,7 +647,7 @@ static void test_setsubtype(
 static int registerTestFunctions(
   sqlite3 *db,
   char **pzErrMsg,
-  const void *pThunk
+  const sqlite3_api_routines *pThunk
 ){
   static const struct {
      char *zName;
@@ -703,7 +703,7 @@ static int SQLITE_TCLAPI autoinstall_test_funcs(
   int objc,
   Tcl_Obj *CONST objv[]
 ){
-  extern int Md5_Register(sqlite3 *, char **, const void *);
+  extern int Md5_Register(sqlite3 *, char **, const sqlite3_api_routines *);
   int rc = sqlite3_auto_extension(registerTestFunctions);
   if( rc==SQLITE_OK ){
     rc = sqlite3_auto_extension(Md5_Register);
@@ -803,7 +803,7 @@ int Sqlitetest_func_Init(Tcl_Interp *interp){
      { "abuse_create_function",         abuse_create_function  },
   };
   int i;
-  extern int Md5_Register(sqlite3 *, char **, const void *);
+  extern int Md5_Register(sqlite3 *, char **, const sqlite3_api_routines *);
 
   for(i=0; i<sizeof(aObjCmd)/sizeof(aObjCmd[0]); i++){
     Tcl_CreateObjCommand(interp, aObjCmd[i].zName, aObjCmd[i].xProc, 0, 0);

diff --git a/src/test_thread.c b/src/test_thread.c
index 68452f0012ae212afb7c37d4e2c534a1a11bd56b..927fee1f56870642eeb6105099b7a410e967587d 100644 (file)
--- a/src/test_thread.c
+++ b/src/test_thread.c
@@ -280,7 +280,7 @@ static int SQLITE_TCLAPI sqlthread_open(
   const char *zFilename;
   sqlite3 *db;
   char zBuf[100];
-  extern int Md5_Register(sqlite3 *, char **, const void *);
+  extern int Md5_Register(sqlite3 *, char **, const sqlite3_api_routines *);
 
   UNUSED_PARAMETER(clientData);
   UNUSED_PARAMETER(objc);