Make sure all the auto-extension mechanism function signatures match up precisely.

FossilOrigin-Name: 87ba69b5ca4a8e4ef2bbaaf07a0ff13fc5cd4721

diff --git a/manifest b/manifest
index 36d529bb7a0c5344bf28e6a5f6fddfe47337c5e7..0fd8b5e7cff53bb923f195976cb50982d6daeb93 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sthe\sextension\sauto-loading\smechanism\swork\swith\sthe\s__stdcall\scalling\sconvention.\s\sAlso,\sfix\sa\scouple\sTcl\scommand\scalling\sconventions\smissed\sin\sthe\sprevious\scheck-in.
-D 2016-07-28T22:23:26.522
+C Make\ssure\sall\sthe\sauto-extension\smechanism\sfunction\ssignatures\smatch\sup\sprecisely.
+D 2016-07-28T22:38:31.788
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233
@@ -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 4e26039f8d2e91acd57e55fcc31477aa37a3aa80
+F src/loadext.c 74a66e96c9b6beafbbc345d9045727e2bd7fd483
 F src/main.c 16c1b2114eae8804caf3a8de8cb47bf2c6d83ad3
 F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
@@ -385,9 +385,9 @@ F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
 F src/shell.c 9351fc6de11e1d908648c0a92d85627138e3dee5
-F src/sqlite.h.in 856ab22cfcec0ba94d2f0139a72a9797343687b3
+F src/sqlite.h.in acd078b5b18d7ceecd9f2bbffc30109a758a73b0
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
-F src/sqlite3ext.h 978c062d3fa59a22c6d57305b9f290e3a26110c3
+F src/sqlite3ext.h ebbcfcc6200d04f04b4e2252327b14c50cd9d49a
 F src/sqliteInt.h 14516943867eb2c30ce0e3670299958f59ade052
 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
 F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab
@@ -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 cbe1de4799df4d512bc175f51ed99c6ec6d5a4d1
-R bda25e48e90849454c6e864127930d74
+P 3ea567c4b07b2a7a027b9b5cb8250ab687803698
+R 51ed71c50a5a0dd10fef4650340d6be2
 U mistachkin
-Z 008c4b78efecf8010a475c91e6246b39
+Z 81fd56db162c30680657ddae99c1b31b

diff --git a/manifest.uuid b/manifest.uuid
index 0a08bdb4e1c9bbcfe402f17cd043e094efd3d055..428fb337c684eddbbcea919127f055b1f657442d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3ea567c4b07b2a7a027b9b5cb8250ab687803698
\ No newline at end of file
+87ba69b5ca4a8e4ef2bbaaf07a0ff13fc5cd4721
\ No newline at end of file

diff --git a/src/loadext.c b/src/loadext.c
index 525272d7febd63c25c68e083548d3b4f803bb89e..c3d91eed33af25a2ff60a3a499bd5068c38c5e3a 100644 (file)
--- a/src/loadext.c
+++ b/src/loadext.c
@@ -676,7 +676,7 @@ static SQLITE_WSD struct sqlite3AutoExtList {
 ** loaded by every new database connection.
 */
 int sqlite3_auto_extension(
-  void (*xInit)(sqlite3 *, char **, const void *) /* Extension entry point */
+  void (*xInit)(sqlite3 *, char **, const sqlite3_api_routines *)
 ){
   int rc = SQLITE_OK;
 #ifndef SQLITE_OMIT_AUTOINIT
@@ -723,7 +723,7 @@ int sqlite3_auto_extension(
 ** was not on the list.
 */
 int sqlite3_cancel_auto_extension(
-  void (*xInit)(sqlite3 *, char **, const void *) /* Extension entry point */
+  void (*xInit)(sqlite3 *, char **, const sqlite3_api_routines *)
 ){
 #if SQLITE_THREADSAFE
   sqlite3_mutex *mutex = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_MASTER);

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 104e4654672db160d733d391f1f3ff0a48e109f5..9fec987d8c0f3d11f93583a59878c7b933a7f88a 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5707,8 +5707,9 @@ int sqlite3_enable_load_extension(sqlite3 *db, int onoff);
 ** See also: [sqlite3_reset_auto_extension()]
 ** and [sqlite3_cancel_auto_extension()]
 */
+typedef struct sqlite3_api_routines sqlite3_api_routines;
 int sqlite3_auto_extension(
-  void (*xEntryPoint)(sqlite3 *, char **, const void *)
+  void (*xEntryPoint)(sqlite3 *, char **, const sqlite3_api_routines *)
 );
 
 /*
@@ -5722,7 +5723,7 @@ int sqlite3_auto_extension(
 ** routines.
 */
 int sqlite3_cancel_auto_extension(
-  void (*xEntryPoint)(sqlite3 *, char **, const void *)
+  void (*xEntryPoint)(sqlite3 *, char **, const sqlite3_api_routines *)
 );
 
 /*

diff --git a/src/sqlite3ext.h b/src/sqlite3ext.h
index d79ca826dee69ff4f10a33a5a504e09b46324bdf..8ee8e2d576cfda56ef86b1aab13ad298ca19413e 100644 (file)
--- a/src/sqlite3ext.h
+++ b/src/sqlite3ext.h
@@ -251,12 +251,13 @@ struct sqlite3_api_routines {
   char *(*vsnprintf)(int,char*,const char*,va_list);
   int (*wal_checkpoint_v2)(sqlite3*,const char*,int,int*,int*);
   /* Version 3.8.7 and later */
-  int (*auto_extension)(void(*)(sqlite3*,char**,const void*));
+  int (*auto_extension)(void(*)(sqlite3*,char**,const sqlite3_api_routines*));
   int (*bind_blob64)(sqlite3_stmt*,int,const void*,sqlite3_uint64,
                      void(*)(void*));
   int (*bind_text64)(sqlite3_stmt*,int,const char*,sqlite3_uint64,
                       void(*)(void*),unsigned char);
-  int (*cancel_auto_extension)(void(*)(sqlite3*,char**,const void*));
+  int (*cancel_auto_extension)(void(*)(sqlite3*,char**,
+                                       const sqlite3_api_routines*));
   int (*load_extension)(sqlite3*,const char*,const char*,char**);
   void *(*malloc64)(sqlite3_uint64);
   sqlite3_uint64 (*msize)(void*);