From: drh <drh@noemail.net>
Date: Wed, 2 Sep 2009 19:04:24 +0000 (+0000)
Subject: Documentation updates for the version info #defines and C interfaces.
X-Git-Tag: fts3-refactor~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e0b31cedadc0b8264e6c700aab27ee445b471d3;p=thirdparty%2Fsqlite.git

Documentation updates for the version info #defines and C interfaces.

FossilOrigin-Name: 69055e9b4cb6346e9e10fd9dd65e6ea06b959e76
---

diff --git a/manifest b/manifest
index f431c607fd..7d6ce136b9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Fix\sa\sproblem\sin\smain.c.\sSQLITE_NoRecTriggers\s->\sSQLITE_RecTriggers.
-D 2009-09-01T17:28:30
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Documentation\supdates\sfor\sthe\sversion\sinfo\s#defines\sand\sC\sinterfaces.
+D 2009-09-02T19:04:24
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 73ddeec9dd10b85876c5c2ce1fdce627e1dcc7f8
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -161,7 +164,7 @@ F src/resolve.c e78029b04dd811e4e0b7be6c51e7c31accc024b6
 F src/rowset.c c64dafba1f9fd876836c8db8682966b9d197eb1f
 F src/select.c 8bc7347fe88cf16ac2cb1a37fb918d1417ab4142
 F src/shell.c db2643650b9268df89a4bedca3f1c6d9e786f1bb
-F src/sqlite.h.in 9d03ceaad971882482c158c0e3d39d361c2c18a1
+F src/sqlite.h.in 94052f827890de6fb7c913b95507076909261d9b
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
 F src/sqliteInt.h 12f2e4a8aa97c5ae9a83b8189d1280c84922cbfd
 F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
@@ -749,7 +752,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P e016cca36390451d5d1c6e0d1b3cdbd6d869be1a
-R acd3399d313713be63b5ac9e469e1eef
-U dan
-Z 942b97fb6c87668f57b8e9b3f6494d95
+P 5ac69ed608affb4104b4665560a3a490ea5af217
+R 10566af31b0374c7038626dfeef64758
+U drh
+Z 7f6492299f8121487dfc1f6dbb36f12d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFKnsG6oxKgR168RlERAupDAJoCIqGchu6twHL3jTPBr50BDayzSQCeONcm
+IJKAS+bpUCteUCbcYgqwY+k=
+=LcCP
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 551f2df18c..7a2e5c5c33 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5ac69ed608affb4104b4665560a3a490ea5af217
\ No newline at end of file
+69055e9b4cb6346e9e10fd9dd65e6ea06b959e76
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index eabed6e710..df2369d652 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -82,22 +82,22 @@ extern "C" {
 ** the sqlite3.h file specify the version of SQLite with which
 ** that header file is associated.
 **
-** The "version" of SQLite is a string of the form "X.Y.Z".
-** The phrase "alpha" or "beta" might be appended after the Z.
-** The X value is major version number always 3 in SQLite3.
-** The X value only changes when backwards compatibility is
+** The "version" of SQLite is a string of the form "W.X.Y" or "W.X.Y.Z".
+** The W value is major version number and is always 3 in SQLite3.
+** The W value only changes when backwards compatibility is
 ** broken and we intend to never break backwards compatibility.
-** The Y value is the minor version number and only changes when
+** The X value is the minor version number and only changes when
 ** there are major feature enhancements that are forwards compatible
 ** but not backwards compatible.
-** The Z value is the release number and is incremented with
-** each release but resets back to 0 whenever Y is incremented.
+** The Y value is the release number and is incremented with
+** each release but resets back to 0 whenever X is incremented.
+** The Z value only appears on branch releases.
 **
 ** The SQLITE_VERSION_NUMBER is an integer that is computed as
 ** follows:
 **
 ** <blockquote><pre>
-** SQLITE_VERSION_NUMBER = X*1000000 + Y*1000 + Z
+** SQLITE_VERSION_NUMBER = W*1000000 + X*1000 + Y
 ** </pre></blockquote>
 **
 ** Since version 3.6.18, SQLite source code has been stored in the
@@ -109,7 +109,8 @@ extern "C" {
 ** source tree.
 **
 ** See also: [sqlite3_libversion()],
-** [sqlite3_libversion_number()], and [sqlite3_sourceid()].
+** [sqlite3_libversion_number()], [sqlite3_sourceid()],
+** [sqlite_version()] and [sqlite_source_id()].
 **
 ** Requirements: [H10011] [H10014]
 */
@@ -124,13 +125,15 @@ extern "C" {
 ** These interfaces provide the same information as the [SQLITE_VERSION],
 ** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] #defines in the header,
 ** but are associated with the library instead of the header file.  Cautious
-** programmers might include an assert in their application to verify that
-** sqlite3_libversion_number() always returns the value
-** [SQLITE_VERSION_NUMBER] and thus insure that the application is
+** programmers might include assert() statements in their application to
+** verify that values returned by these interfaces match the macros in
+** the header, and thus insure that the application is
 ** compiled with matching library and header files.
 **
 ** <blockquote><pre>
 ** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
+** assert( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)==0 );
+** assert( strcmp(sqlite3_libversion,SQLITE_VERSION)==0 );
 ** </pre></blockquote>
 **
 ** The sqlite3_libversion() function returns the same information as is
@@ -140,6 +143,8 @@ extern "C" {
 ** returns the same information as is in the [SQLITE_SOURCE_ID] #define of
 ** the header file.
 **
+** See also: [sqlite_version()] and [sqlite_source_id()].
+**
 ** Requirements: [H10021] [H10022] [H10023]
 */
 SQLITE_EXTERN const char sqlite3_version[];