From 421dfca16b0f7c984e32c90c68104b911ffadef7 Mon Sep 17 00:00:00 2001 From: mihailim Date: Sun, 22 Jun 2008 16:35:48 +0000 Subject: [PATCH] Removed INVARIANTS sections in the experimental extension loading API that I should not have added in the first place. No changes to code. (CVS 5273) FossilOrigin-Name: e7610890b4df78af5bb8f3e8f8d05ef5cf36e186 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/sqlite.h.in | 19 ++++++------------- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/manifest b/manifest index 300354493d..db2fb44b50 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sbug\sin\sthe\sKEYINFO\shandling\swithin\sselect.c.\s\sChange\sthe\sOP_Move\nopcode\sto\stake\sa\scount\sand\sto\smove\smultiple\sregisters.\s\sInitial\scode\sfor\nthe\scompound-select\smerge\soptimization\sis\sadded\sbut\sis\sincomplete\nand\sis\scommented\sout.\s(CVS\s5272) -D 2008-06-22T12:37:58 +C Removed\sINVARIANTS\ssections\sin\sthe\sexperimental\sextension\sloading\sAPI\sthat\sI\sshould\snot\shave\sadded\sin\sthe\sfirst\splace.\sNo\schanges\sto\scode.\s(CVS\s5273) +D 2008-06-22T16:35:49 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.in ff6f90048555a0088f6a4b7406bed5e55a7c4eff F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -143,7 +143,7 @@ F src/printf.c 8b063da9dcde26b7c500a01444b718d86f21bc6e F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a F src/select.c ea3e5e233cf16f4cb43f6ec35972683ae7bc03f3 F src/shell.c a12ea645271b7876c8f080146f48e20b00d367ec -F src/sqlite.h.in 60ce95e390d351f25b2105e0db9f04714e3e544c +F src/sqlite.h.in 4a42be927bc632f7c06042e5022c64834cc82943 F src/sqlite3ext.h f162a72daef5ebf8b211fe8c0ec96e85d22fbf9b F src/sqliteInt.h 973e5cc6db87f12eba25ae847494af57844be9bf F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8 @@ -592,7 +592,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P b55590501b5b5ada4e22d790e1a36b532de7deb7 -R 65180a3dac28f30f6bbb45974eb11cf2 -U drh -Z 7b4a125c9de4dedebb0132f22a9c88b3 +P 663a590e3086145a57af7569d8f798b6b6a8b76c +R 45e33e074c642d8dbfde0cca0369777f +U mihailim +Z fea5e0f4352ec79670c3c8b75e3787b1 diff --git a/manifest.uuid b/manifest.uuid index cae6769604..02d51a8d54 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -663a590e3086145a57af7569d8f798b6b6a8b76c \ No newline at end of file +e7610890b4df78af5bb8f3e8f8d05ef5cf36e186 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index b6fdd59263..ef0912556a 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -30,7 +30,7 @@ ** the version number) and changes its name to "sqlite3.h" as ** part of the build process. ** -** @(#) $Id: sqlite.h.in,v 1.351 2008/06/22 10:21:27 mihailim Exp $ +** @(#) $Id: sqlite.h.in,v 1.352 2008/06/22 16:35:49 mihailim Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -4992,8 +4992,6 @@ int sqlite3_table_column_metadata( ** ** This interface loads an SQLite extension library from the named file. ** -** INVARIANTS: -** ** {F12601} The sqlite3_load_extension() interface attempts to load an ** SQLite extension library contained in the file zFile. ** @@ -5006,10 +5004,11 @@ int sqlite3_table_column_metadata( ** [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong. ** ** {F12605} If an error occurs and pzErrMsg is not 0, then the -** sqlite3_load_extension() interface shall attempt to fill -** *pzErrMsg with error message text stored in memory obtained -** from [sqlite3_malloc()]. {END} The calling function should free -** this memory by calling [sqlite3_free()]. +** [sqlite3_load_extension()] interface shall attempt to +** fill *pzErrMsg with error message text stored in memory +** obtained from [sqlite3_malloc()]. {END} The calling function +** should free this memory by calling [sqlite3_free()]. +** ** {F12606} Extension loading must be enabled using ** [sqlite3_enable_load_extension()] prior to calling this API, ** otherwise an error will be returned. @@ -5031,8 +5030,6 @@ int sqlite3_load_extension( ** ** Extension loading is off by default. See ticket #1863. ** -** INVARIANTS: -** ** {F12621} Call the sqlite3_enable_load_extension() routine with onoff==1 ** to turn extension loading on and call it with onoff==0 to turn ** it back off again. @@ -5056,8 +5053,6 @@ int sqlite3_enable_load_extension(sqlite3 *db, int onoff); ** This interface is experimental and is subject to change or ** removal in future releases of SQLite. ** -** INVARIANTS: -** ** {F12641} This function registers an extension entry point that is ** automatically invoked whenever a new [database connection] ** is opened using [sqlite3_open()], [sqlite3_open16()], @@ -5083,8 +5078,6 @@ int sqlite3_auto_extension(void *xEntryPoint); ** This interface is experimental and is subject to change or ** removal in future releases of SQLite. ** -** INVARIANTS: -** ** {F12661} This function disables all previously registered ** automatic extensions. **