From: drh <drh@noemail.net>
Date: Wed, 31 Mar 2010 13:57:56 +0000 (+0000)
Subject: Documentation enhancements for the sqlite3_log() interface.  No functional
X-Git-Tag: version-3.7.2~507
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3d986d329a3dd0ac1cf7fb12c87bcdcfa971e3d;p=thirdparty%2Fsqlite.git

Documentation enhancements for the sqlite3_log() interface.  No functional
changes to code.

FossilOrigin-Name: ba13a11108d7852c61f959cc8a5fc39c25202cae
---

diff --git a/manifest b/manifest
index e73adfc2a1..c930b24fe0 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Include\sshell.c\sand\ssqlite3.def\sin\sthe\samalgamation\sZIP\sarchive.\nTicket\s[e063139eb3f8]
-D 2010-03-31T11:52:57
+C Documentation\senhancements\sfor\sthe\ssqlite3_log()\sinterface.\s\sNo\sfunctional\nchanges\sto\scode.
+D 2010-03-31T13:57:56
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -169,7 +169,7 @@ F src/resolve.c a1648d98e869937b29f4f697461fe4d60f220a7b
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c 4113ef360430ed4e7533690ef46d06c20204adce
 F src/shell.c c40427c7245535a04a9cb4a417b6cc05c022e6a4
-F src/sqlite.h.in 68136db68b5e97ee93964229cf5075e703c0fbc2
+F src/sqlite.h.in 1b81828af38e040820577fb7a05e7f378add7e6f
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
 F src/sqliteInt.h f9b890585c644da05e86b772042ae2059e61fd27
 F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6
@@ -797,14 +797,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P dbc2c3c0144d2c76aec04f80892302c532947dc8
-R 3037184c965203006acbf1cd412f7e5a
+P 0077ed5cf4e56eb81cfa850fc98e6b033708fc03
+R 56c8343b4f277bc12b9b897cd58cdd94
 U drh
-Z 427eef50bf430a6920feb6ce94562646
+Z 8ebc2b432bd50e0f49413539fdd5f09e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLszecoxKgR168RlERAjBXAJ94SerW4d8ll6URitTshltjV4DMbACfXBJr
-nwahVOzhx6351niCusxMtk0=
-=Ud9w
+iD8DBQFLs1TnoxKgR168RlERAjpyAJ0YF9xHerWV0uBAKaw5dzIZU55JlgCfXja8
+4NzKAVp1wWjQNstlPw5vIz4=
+=FiSS
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 48012fab7c..f3baac272a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0077ed5cf4e56eb81cfa850fc98e6b033708fc03
\ No newline at end of file
+ba13a11108d7852c61f959cc8a5fc39c25202cae
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index eef6b7ab52..4777a87ec7 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -1261,6 +1261,24 @@ struct sqlite3_mem_methods {
 ** [sqlite3_pcache_methods] object.  SQLite copies of the current
 ** page cache implementation into that object.)^ </dd>
 **
+** <dt>SQLITE_CONFIG_LOG</dt>
+** <dd> ^The SQLITE_CONFIG_LOG option takes two arguments: a pointer to a
+** function with a call signature of void(*)(void*,int,const char*), 
+** and a pointer to void. ^If the function pointer is not NULL, it is
+** invoked by [sqlite3_log()] to process each logging event.  ^If the
+** function pointer is NULL, the [sqlite3_log()] interface becomes a no-op.
+** ^The void pointer that is the second argument to SQLITE_CONFIG_LOG is
+** passed through as the first parameter to the application-defined logger
+** function whenever that function is invoked.  ^The second parameter to
+** the logger function is a copy of the first parameter to the corresponding
+** [sqlite3_log()] call and is intended to be a [result code] or an
+** [extended result code].  ^The third parameter passed to the logger is
+** log message after formatting via [sqlite3_snprintf()].
+** The SQLite logging interface is not reentrant; the logger function
+** supplied by the application must not invoke any SQLite interface.
+** In a multi-threaded application, the application-defined logger
+** function must be threadsafe. </dd>
+**
 ** </dl>
 */
 #define SQLITE_CONFIG_SINGLETHREAD  1  /* nil */
@@ -5677,7 +5695,7 @@ int sqlite3_strnicmp(const char *, const char *, int);
 ** ^The [sqlite3_log()] interface writes a message into the error log
 ** established by the [SQLITE_CONFIG_LOG] option to [sqlite3_config()].
 ** ^If logging is enabled, the zFormat string and subsequent arguments are
-** passed through to [sqlite3_vmprintf()] to generate the final output string.
+** used with [sqlite3_snprintf()] to generate the final output string.
 **
 ** The sqlite3_log() interface is intended for use by extensions such as
 ** virtual tables, collating functions, and SQL functions.  While there is