diff options
author | drh <drh@noemail.net> | 2006-12-19 18:57:11 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2006-12-19 18:57:11 +0000 |
commit | f533acc0a7331f4236c6b0938561c9a6d6b0077c (patch) | |
tree | b31d6136628e01890b2500bb260613f183834402 | |
parent | cf68ae91eac8ba0310cc9425c55a19fe1b672848 (diff) | |
download | sqlite-f533acc0a7331f4236c6b0938561c9a6d6b0077c.tar.gz sqlite-f533acc0a7331f4236c6b0938561c9a6d6b0077c.zip |
Build without warnings and pass all tests with SQLITE_OMIT_LOAD_EXTENSION.
Ticket #2113. (CVS 3534)
FossilOrigin-Name: c3d118b40811b201e4a98b62549c5439d7d5098d
-rw-r--r-- | manifest | 16 | ||||
-rw-r--r-- | manifest.uuid | 2 | ||||
-rw-r--r-- | src/main.c | 4 | ||||
-rw-r--r-- | src/tclsqlite.c | 8 | ||||
-rw-r--r-- | src/test_autoext.c | 4 |
5 files changed, 20 insertions, 14 deletions
@@ -1,5 +1,5 @@ -C Fix\sa\stypo\sin\sshell.c.\s\sTicket\s#2111.\s(CVS\s3533) -D 2006-12-19T18:47:41 +C Build\swithout\swarnings\sand\spass\sall\stests\swith\sSQLITE_OMIT_LOAD_EXTENSION.\nTicket\s#2113.\s(CVS\s3534) +D 2006-12-19T18:57:11 F Makefile.in 8e14898d41a53033ecb687d93c9cd5d109fb9ae3 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -72,7 +72,7 @@ F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564 F src/insert.c e9526ced19978a55687b55faea969b6ff2a53fb4 F src/legacy.c 2631df6a861f830d6b1c0fe92b9fdd745b2c0cd6 F src/loadext.c ab9b7fc502078a93f97161d28b4aac6ae2aad793 -F src/main.c 646deaa19e367fa8f3ace8b2e4577a53b1461d85 +F src/main.c 33c32014da3a1471e8869d2eba32b2c4314c39ce F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217 F src/os.c 59f05de8c5777c34876607114a2fbe55ae578235 F src/os.h fa6fcf5e4614a20ca2c90cddda0b40199360f27e @@ -99,7 +99,7 @@ F src/sqlite.h.in 2931f7ee2415e7a49fd12f386c23575046f0f540 F src/sqlite3ext.h 2c2156cc32a158e2b7bd9042d42accf94bff2e40 F src/sqliteInt.h 28d060f44a4a3ad1acb47bf1cef627c86ec45f5f F src/table.c 6d0da66dde26ee75614ed8f584a1996467088d06 -F src/tclsqlite.c c23c6ce368073afec063f4412e1c8bbace75419e +F src/tclsqlite.c d344c7f394d6f055ce3abfe0049b0480c5e34e56 F src/test1.c 19786ff3274635b6eac27a89f842416f388f3654 F src/test2.c ca74a1d8aeb7d9606e8f6b762c5daf85c1a3f92b F src/test3.c 85135c09560c48bdb0a23c9b890ab405486b8ec9 @@ -109,7 +109,7 @@ F src/test6.c 60a02961ceb7b3edc25f5dc5c1ac2556622a76de F src/test7.c 03fa8d787f6aebc6d1f72504d52f33013ad2c8e3 F src/test8.c 48b7ac78ca3c93210b7355da94325baa901ecfeb F src/test_async.c e3deaedd4d86a56391b81808fde9e44fbd92f1d3 -F src/test_autoext.c bbb70bc1c83bd273cf59908ca9b486ae5df55a59 +F src/test_autoext.c 855157d97aa28cf84233847548bfacda21807436 F src/test_loadext.c 22065d601a18878e5542191001f0eaa5d77c0ed8 F src/test_md5.c 6c42bc0a3c0b54be34623ff77a0eec32b2fa96e3 F src/test_schema.c ced72140a3a25c148975428e170ec1850d3c3a7d @@ -423,7 +423,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P bf4a78cb315c0b1fca31c6f596ff0a8ece96860f -R 882c41be19876efc128a7cc22362c5d3 +P 6f8a56231c4d0d990c54365f0ff0544bd8b3caf8 +R 574c656ba627cd0c820023301e6c98b4 U drh -Z a45a188aeb195bbbdd957844c1728cb4 +Z be9ea106ba788c036b500ebe0c1312a3 diff --git a/manifest.uuid b/manifest.uuid index 4bf61695c..e6db0b8d7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6f8a56231c4d0d990c54365f0ff0544bd8b3caf8
\ No newline at end of file +c3d118b40811b201e4a98b62549c5439d7d5098d
\ No newline at end of file diff --git a/src/main.c b/src/main.c index 86093bbd3..2e301502b 100644 --- a/src/main.c +++ b/src/main.c @@ -14,7 +14,7 @@ ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** -** $Id: main.c,v 1.359 2006/10/19 20:27:59 shess Exp $ +** $Id: main.c,v 1.360 2006/12/19 18:57:11 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -942,7 +942,7 @@ static int openDatabase( /* Load automatic extensions - extensions that have been registered ** using the sqlite3_automatic_extension() API. */ - sqlite3AutoLoadExtensions(db); + (void)sqlite3AutoLoadExtensions(db); #ifdef SQLITE_ENABLE_FTS1 { diff --git a/src/tclsqlite.c b/src/tclsqlite.c index ee13a9481..cd48cf5d4 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -11,7 +11,7 @@ ************************************************************************* ** A TCL Interface to SQLite ** -** $Id: tclsqlite.c,v 1.174 2006/12/19 18:46:09 drh Exp $ +** $Id: tclsqlite.c,v 1.175 2006/12/19 18:57:11 drh Exp $ */ #ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ @@ -1173,6 +1173,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ ** default. */ case DB_ENABLE_LOAD_EXTENSION: { +#ifndef SQLITE_OMIT_LOAD_EXTENSION int onoff; if( objc!=3 ){ Tcl_WrongNumArgs(interp, 2, objv, "BOOLEAN"); @@ -1183,6 +1184,11 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ } sqlite3_enable_load_extension(pDb->db, onoff); break; +#else + Tcl_AppendResult(interp, "extension loading is turned off at compile-time", + 0); + return TCL_ERROR; +#endif } /* diff --git a/src/test_autoext.c b/src/test_autoext.c index 08b8eec36..0eaeda057 100644 --- a/src/test_autoext.c +++ b/src/test_autoext.c @@ -11,10 +11,10 @@ ************************************************************************* ** Test extension for testing the sqlite3_auto_extension() function. ** -** $Id: test_autoext.c,v 1.1 2006/08/23 20:07:22 drh Exp $ +** $Id: test_autoext.c,v 1.2 2006/12/19 18:57:11 drh Exp $ */ -#ifndef SQLITE_OMIT_LOAD_EXTENSION #include "tcl.h" +#ifndef SQLITE_OMIT_LOAD_EXTENSION #include "sqlite3ext.h" static SQLITE_EXTENSION_INIT1 |