Updates to the documentation on the VFS xOpen method.

FossilOrigin-Name: 1719cb8f49bb138adcf8913a2d042f9e1360d78a

diff --git a/manifest b/manifest
index 14c140f612b5ada2b8d7869519077d06b8ff804e..ce72d905db76eec3271cf7938e91a31110bc24a8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Update\sthe\ssqlite3_limit()\sdocumentation\sto\sexplain\sthat\sSQLITE_LIMIT_VDBE_OP\nis\snot\senforced.
-D 2010-09-07T19:10:02
+C Updates\sto\sthe\sdocumentation\son\sthe\sVFS\sxOpen\smethod.
+D 2010-09-07T23:28:58
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -177,7 +177,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c b0b124781474e4e0c8f64022875e5e2009e13443
 F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056
-F src/sqlite.h.in 8f18e4931c32e971b850fd6a469ecb56affdcbb1
+F src/sqlite.h.in fef9e187420e234ecc45962f76dfb30065c3ba34
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
 F src/sqliteInt.h 4e31d3b58720d6251e08ba394641b9a63725eb8a
 F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
@@ -860,14 +860,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 282dae7edf7209197fffb6c58b038b3aae1a0367
-R d5359eb53181b1e8d4a88b8067d6c633
+P 17be9beeab273a0fa84e107c674aee4cd83e6f79
+R 911573a8b1de1f57bea2cb134df5d756
 U drh
-Z 6fe2ed5bc268add10683709bc6f1360a
+Z 4e226c87a5e40540185fa2e3098e796e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMho4RoxKgR168RlERAmLsAJ4nh+tVMrB57mfGUM44EFWhzYbCBQCfXrrZ
-ryEkrW0HwLG1pjJCuj103C0=
-=jx6O
+iD8DBQFMhsq9oxKgR168RlERAgUeAJ9AEV+aEXE++4XScTgFHFNY8GKVOwCeOjKr
+h7Rvw0kRZ1G+pGZ0UIxeN1M=
+=y9+z
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 7bedcf1c6e13c5ca6bcb3cc0c8d9e16c7a2e0b32..c36caa06db470c572b40a659c58d759408a417de 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-17be9beeab273a0fa84e107c674aee4cd83e6f79
\ No newline at end of file
+1719cb8f49bb138adcf8913a2d042f9e1360d78a
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 7210501b0c40c439887cefe29445bc87ac96daa4..4472aca496de320efdc980f5bb951be9276c8f6b 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -752,9 +752,13 @@ typedef struct sqlite3_mutex sqlite3_mutex;
 ** The zName field holds the name of the VFS module.  The name must
 ** be unique across all VFS modules.
 **
-** ^SQLite will guarantee that the zFilename parameter to xOpen
+** ^SQLite guarantees that the zFilename parameter to xOpen
 ** is either a NULL pointer or string obtained
-** from xFullPathname().  ^SQLite further guarantees that
+** from xFullPathname() with an optional suffix added.
+** ^If a suffix is added to the zFilename parameter, it will
+** consist of a single "-" character followed by no more than
+** 10 alphanumeric and/or "-" characters.
+** ^SQLite further guarantees that
 ** the string will be valid and unchanged until xClose() is
 ** called. Because of the previous sentence,
 ** the [sqlite3_file] can safely store a pointer to the