diff options
| author | mistachkin <mistachkin@noemail.net> | 2016-07-28 22:46:53 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2016-07-28 22:46:53 +0000 |
| commit | 78d5e02f99c1e555212da6e8699eead360cf314c (patch) | |
| tree | c1897177428a2193d21c1def53155a5c47b1f7f1 /src | |
| parent | 177d0f0b478e59c3b116693e7246537f130be543 (diff) | |
| download | sqlite-78d5e02f99c1e555212da6e8699eead360cf314c.tar.gz sqlite-78d5e02f99c1e555212da6e8699eead360cf314c.zip | |
The return type used by the auto-extension entry points is 'int', not 'void'.
FossilOrigin-Name: bf9c86c74f30136a106f37603a6c7dcc76caf41d
Diffstat (limited to 'src')
| -rw-r--r-- | src/loadext.c | 4 | ||||
| -rw-r--r-- | src/sqlite.h.in | 4 | ||||
| -rw-r--r-- | src/sqlite3ext.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/loadext.c b/src/loadext.c index c3d91eed3..163141bf7 100644 --- 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 sqlite3_api_routines *) + int (*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 sqlite3_api_routines *) + int (*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 9fec987d8..9d28cdc05 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -5709,7 +5709,7 @@ int sqlite3_enable_load_extension(sqlite3 *db, int onoff); */ typedef struct sqlite3_api_routines sqlite3_api_routines; int sqlite3_auto_extension( - void (*xEntryPoint)(sqlite3 *, char **, const sqlite3_api_routines *) + int (*xEntryPoint)(sqlite3 *, char **, const sqlite3_api_routines *) ); /* @@ -5723,7 +5723,7 @@ int sqlite3_auto_extension( ** routines. */ int sqlite3_cancel_auto_extension( - void (*xEntryPoint)(sqlite3 *, char **, const sqlite3_api_routines *) + int (*xEntryPoint)(sqlite3 *, char **, const sqlite3_api_routines *) ); /* diff --git a/src/sqlite3ext.h b/src/sqlite3ext.h index 8ee8e2d57..689a5c485 100644 --- a/src/sqlite3ext.h +++ b/src/sqlite3ext.h @@ -251,12 +251,12 @@ 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 sqlite3_api_routines*)); + int (*auto_extension)(int(*)(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**, + int (*cancel_auto_extension)(int(*)(sqlite3*,char**, const sqlite3_api_routines*)); int (*load_extension)(sqlite3*,const char*,const char*,char**); void *(*malloc64)(sqlite3_uint64); |