From: drh Date: Mon, 2 Nov 2009 15:51:52 +0000 (+0000) Subject: Comment changes in support of better documentation. No changes to code. X-Git-Tag: fts3-refactor~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7ae4e2c98db6a1b41fa9433681fdfe134a520cd;p=thirdparty%2Fsqlite.git Comment changes in support of better documentation. No changes to code. FossilOrigin-Name: 79ab4714e408d01103b277c234b10db50a50352a --- diff --git a/manifest b/manifest index a553480363..0b90a94e56 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Fix\scompiler\swarnings.\s\sBetter\scomments\son\ssome\svariables\sassociated\swith\nLIKE/GLOB\sprocessing\sin\sthe\squery\splanner. -D 2009-11-01T19:26:59 +C Comment\schanges\sin\ssupport\sof\sbetter\sdocumentation.\s\sNo\schanges\sto\scode. +D 2009-11-02T15:51:52 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in a77dfde96ad86aafd3f71651a4333a104debe86a F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -151,7 +151,7 @@ F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5 F src/os_unix.c a4b4ea928ce31ed34cb8f90ed36a35df19312fad F src/os_win.c d02908847f3ad350fb9fd0804b7722627d30860d -F src/pager.c ebd0a8f2421e8f0ad5b78201440004bf3e1c96d8 +F src/pager.c 729f73feeb33355ae1f0982a74f112ce190c74aa F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f F src/parse.y 0204f0dfe8974dc2a0d46eb9ab98a433a1f963d6 F src/pcache.c c92ffd4f3e1279b3766854c6d18b5bf4aac0d1fa @@ -165,7 +165,7 @@ F src/resolve.c 3ac31c7181fab03732125fdedf7c2091a5c07f1b F src/rowset.c c64dafba1f9fd876836c8db8682966b9d197eb1f F src/select.c cbe366a0ce114856e66f5daf0f848d7c48a88298 F src/shell.c f66531a57fff927f95c98d99c28237d88e400c86 -F src/sqlite.h.in 5853e42a4066a6c9c3bf6592a9d57d0012bfdb90 +F src/sqlite.h.in 9106176cf206c36f01f8b761ba62671818bbe6ff F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17 F src/sqliteInt.h 00256600cb4e17d71373df3844aa53aed5594cdb F src/sqliteLimit.h 38b2fffcd01faeaeaadea71b2b47695a81580c8b @@ -764,14 +764,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 612952743da28e651512547fc0d3925f4c698eb4 -R 074de9658c3cbab2627eebe475a5eccf +P cfa2db0ff7a94e7f66c35f672ee41cadd45a6dd7 +R 5c076003a17b97ba08cbcb6b3d2c7327 U drh -Z 9daa7957e26dec230ab28c44ffc262ec +Z 257c44c9f05fd1d0d86b5612805cbc79 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.8 (Darwin) +Version: GnuPG v1.4.6 (GNU/Linux) -iEYEARECAAYFAkrt4QMACgkQoxKgR168RlFoyACfRiKYJgjLjh6IjkSJu6thjsgq -xiQAn0pCS//cHUfwD80J45UQYZEGz+00 -=KSFH +iD8DBQFK7wAboxKgR168RlERApt7AKCDEqBWyftkDmtcMtaVa2MbYSgsZwCffMzG +xzrrGaJVHyspRMN9wRNQBg4= +=ri9i -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index c753616689..e1385e7c9e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -cfa2db0ff7a94e7f66c35f672ee41cadd45a6dd7 \ No newline at end of file +79ab4714e408d01103b277c234b10db50a50352a \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index 65cd317071..9ab6262efe 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1820,21 +1820,15 @@ static void setSectorSize(Pager *pPager){ ** database to during a rollback. ** (5) 4 byte big-endian integer which is the sector size. The header ** is this many bytes in size. -** (6) 4 byte big-endian integer which is the page case. -** (7) 4 byte integer which is the number of bytes in the master journal -** name. The value may be zero (indicate that there is no master -** journal.) -** (8) N bytes of the master journal name. The name will be nul-terminated -** and might be shorter than the value read from (5). If the first byte -** of the name is \000 then there is no master journal. The master -** journal name is stored in UTF-8. -** (9) Zero or more pages instances, each as follows: +** (6) 4 byte big-endian integer which is the page size. +** (7) zero padding out to the next sector size. +** (8) Zero or more pages instances, each as follows: ** + 4 byte page number. ** + pPager->pageSize bytes of data. ** + 4 byte checksum ** -** When we speak of the journal header, we mean the first 8 items above. -** Each entry in the journal is an instance of the 9th item. +** When we speak of the journal header, we mean the first 7 items above. +** Each entry in the journal is an instance of the 8th item. ** ** Call the value from the second bullet "nRec". nRec is the number of ** valid page entries in the journal. In most cases, you can compute the diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 5a58a53417..967986e4bf 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -2284,7 +2284,7 @@ int sqlite3_limit(sqlite3*, int id, int newVal); /* ** CAPI3REF: Run-Time Limit Categories {H12790} -** KEYWORDS: {limit category} {limit categories} +** KEYWORDS: {limit category} {*limit categories} ** ** These constants define various performance limits ** that can be lowered at run-time using [sqlite3_limit()].