mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the _SafeInit() entry points from the TCL interface. They have long

Browse Source 
been no-ops.  Removing them completely avoids confusion as to why they
don't work.

FossilOrigin-Name: 0fb26c7bfa7a4bb1503f90fd6f5b9c70f444665b
This commit is contained in:
drh 2012-03-20 15:10:42 +00:00
parent 7b7c359fe6
commit d878cab51a
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifest
View File

@ -1,5 +1,5 @@
C Version\s3.7.11
D 2012-03-20T11:35:50.522
C Remove\sthe\s_SafeInit()\sentry\spoints\sfrom\sthe\sTCL\sinterface.\s\sThey\shave\slong\nbeen\sno-ops.\s\sRemoving\sthem\scompletely\savoids\sconfusion\sas\sto\swhy\sthey\ndon't\swork.
D 2012-03-20T15:10:42.442
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -188,7 +188,7 @@ F src/sqliteInt.h e65429a6f19b41720561b9434b2192574a91cfa2
F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
F src/tclsqlite.c 2aeb69958965dad0842d5ea1456f1a958ef296e6
F src/tclsqlite.c 086dfdd72e5892de223968a258e1ccbd9693e717
F src/test1.c 07f30e8714bab94d8de8a88865d9c59bc512a1a8
F src/test2.c 711555927f1f7e8db9aab86b512bc6934a774abe
F src/test3.c 91d3f1a09cfae3533ef17d8b484a160f3d1f1a21
@ -992,8 +992,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
P 7b449b301ea03295262b8d572b02625e4b39cfa5
R 4ef201d6122aecff56466ef062fb4020
T +sym-version-3.7.11 *
P 00bb9c9ce4f465e6ac321ced2a9d0062dc364669
R 0bae8756351ce6c993966becd439fadf
U drh
Z 8740abf5f4801e70716f6cff3569cf87
Z d1e2a2d0a2cbd6a9676ec1f5c607220d

2
manifest.uuid
View File

@ -1 +1 @@
00bb9c9ce4f465e6ac321ced2a9d0062dc364669
0fb26c7bfa7a4bb1503f90fd6f5b9c70f444665b

12
src/tclsqlite.c
View File

@ -3108,23 +3108,19 @@ EXTERN int Sqlite3_Init(Tcl_Interp *interp){
return TCL_OK;
}
EXTERN int Tclsqlite3_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
EXTERN int Sqlite3_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
EXTERN int Tclsqlite3_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
EXTERN int Sqlite3_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
EXTERN int Tclsqlite3_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
EXTERN int Sqlite3_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK; }
EXTERN int Tclsqlite3_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK;}
/* Because it accesses the file-system and uses persistent state, SQLite
** is not considered appropriate for safe interpreters. Hence, we deliberately
** omit the _SafeInit() interfaces.
*/
#ifndef SQLITE_3_SUFFIX_ONLY
int Sqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
int Tclsqlite_Init(Tcl_Interp *interp){ return Sqlite3_Init(interp); }
int Sqlite_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
int Tclsqlite_SafeInit(Tcl_Interp *interp){ return TCL_OK; }
int Sqlite_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
int Tclsqlite_Unload(Tcl_Interp *interp, int flags){ return TCL_OK; }
int Sqlite_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK; }
int Tclsqlite_SafeUnload(Tcl_Interp *interp, int flags){ return TCL_OK;}
#endif
#ifdef TCLSH