Further improvements to error handling of the run-time loading of SQLite

into TCL.

FossilOrigin-Name: 7cc0c4ee11ad250fa848e7da4713d70fc0fa3715

diff --git a/manifest b/manifest
index 197b521b86f4cbfa040e750b44ff5783c866e19d..e49b5c47eca52f71102f1004097e76c20e778e3a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\shandling\sof\serrors\swhen\sdoing\srun-time\sloading\sof\san\sSQLite\nshared-library\sinto\sTCL.
-D 2013-05-31T15:36:07.208
+C Further\simprovements\sto\serror\shandling\sof\sthe\srun-time\sloading\sof\sSQLite\ninto\sTCL.
+D 2013-06-03T12:34:46.177
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -224,7 +224,7 @@ F src/sqliteInt.h 46fb17f604ce941551fe64c342dbeb4dbed3edaa
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
-F src/tclsqlite.c b90c5175b080a7d511fb06da0ada0c3d65d20b3b
+F src/tclsqlite.c b8835978e853a89bf58de88acc943a5ca94d752e
 F src/test1.c 6d2a340eea1d866bf7059894491652a69a7ee802
 F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
 F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
@@ -1093,7 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P d5b084e9d8cfe9c0c339aca076d472bb50aa764c
-R 2882afbdbc546836259a7beab1bfa1d4
+P b3f23d186425d2362b756708cbaf422ba3c751f9
+R 3d8fd48ca795de4c58516ba1337670b0
 U drh
-Z ab4690d9d62a96dd945919f7fe2c1c88
+Z 53e0acf52f5e2ddf8d35e0395d7b33fa

diff --git a/manifest.uuid b/manifest.uuid
index 74edec22a473cd9e546bba49cdd90f432c475e92..af34504f4c28759d7d098e6dbaa000855d5cc684 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b3f23d186425d2362b756708cbaf422ba3c751f9
\ No newline at end of file
+7cc0c4ee11ad250fa848e7da4713d70fc0fa3715
\ No newline at end of file

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 325e809faba8be1ed7cac49a8b853beeba154d91..6d2a51e5ab0c59a739bf347bf4383c613618f277 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -3050,7 +3050,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
 */
 #ifndef USE_TCL_STUBS
 # undef  Tcl_InitStubs
-# define Tcl_InitStubs(a,b,c) TCL_OK
+# define Tcl_InitStubs(a,b,c) TCL_VERSION
 #endif
 
 /*
@@ -3074,7 +3074,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
 ** The EXTERN macros are required by TCL in order to work on windows.
 */
 EXTERN int Sqlite3_Init(Tcl_Interp *interp){
-  int rc = Tcl_InitStubs(interp, "8.4", 0);
+  int rc = Tcl_InitStubs(interp, "8.4", 0)==0 ? TCL_ERROR : TCL_OK;
   if( rc==TCL_OK ){
     Tcl_CreateObjCommand(interp, "sqlite3", (Tcl_ObjCmdProc*)DbMain, 0, 0);
 #ifndef SQLITE_3_SUFFIX_ONLY