diff --git a/ext/session/sqlite3session.h b/ext/session/sqlite3session.h index 2ddad6a8a3..2819bfece6 100644 --- a/ext/session/sqlite3session.h +++ b/ext/session/sqlite3session.h @@ -262,8 +262,8 @@ int sqlite3changeset_next(sqlite3_changeset_iter *pIter); ** The pIter argument passed to this function may either be an iterator ** passed to a conflict-handler by [sqlite3changeset_apply()], or an iterator ** created by [sqlite3changeset_start()]. In the latter case, the most recent -** call to [sqlite3changeset_next()] must have returned SQLITE_ROW. If this -** is not the case, this function returns SQLITE_MISUSE. +** call to [sqlite3changeset_next()] must have returned [SQLITE_ROW]. If this +** is not the case, this function returns [SQLITE_MISUSE]. ** ** If argument pzTab is not NULL, then *pzTab is set to point to a ** nul-terminated utf-8 encoded string containing the name of the table @@ -271,9 +271,9 @@ int sqlite3changeset_next(sqlite3_changeset_iter *pIter); ** sqlite3changeset_next() is called on the iterator or until the ** conflict-handler function returns. If pnCol is not NULL, then *pnCol is ** set to the number of columns in the table affected by the change. Finally, -** if pOp is not NULL, then *pOp is set to one of SQLITE_INSERT, SQLITE_DELETE -** or SQLITE_UPDATE, depending on the type of change that the iterator -** currently points to. +** if pOp is not NULL, then *pOp is set to one of [SQLITE_INSERT], +** [SQLITE_DELETE] or [SQLITE_UPDATE], depending on the type of change that +** the iterator currently points to. ** ** If no error occurs, SQLITE_OK is returned. If an error does occur, an ** SQLite error code is returned. The values of the output variables may not @@ -294,12 +294,12 @@ int sqlite3changeset_op( ** created by [sqlite3changeset_start()]. In the latter case, the most recent ** call to [sqlite3changeset_next()] must have returned SQLITE_ROW. ** Furthermore, it may only be called if the type of change that the iterator -** currently points to is either SQLITE_DELETE or SQLITE_UPDATE. Otherwise, -** this function returns SQLITE_MISUSE and sets *ppValue to NULL. +** currently points to is either [SQLITE_DELETE] or [SQLITE_UPDATE]. Otherwise, +** this function returns [SQLITE_MISUSE] and sets *ppValue to NULL. ** ** Argument iVal must be greater than or equal to 0, and less than the number ** of columns in the table affected by the current change. Otherwise, -** SQLITE_RANGE is returned and *ppValue is set to NULL. +** [SQLITE_RANGE] is returned and *ppValue is set to NULL. ** ** If successful, this function sets *ppValue to point to a protected ** sqlite3_value object containing the iVal'th value from the vector of @@ -324,12 +324,12 @@ int sqlite3changeset_old( ** created by [sqlite3changeset_start()]. In the latter case, the most recent ** call to [sqlite3changeset_next()] must have returned SQLITE_ROW. ** Furthermore, it may only be called if the type of change that the iterator -** currently points to is either SQLITE_UPDATE or SQLITE_INSERT. Otherwise, -** this function returns SQLITE_MISUSE and sets *ppValue to NULL. +** currently points to is either [SQLITE_UPDATE] or [SQLITE_INSERT]. Otherwise, +** this function returns [SQLITE_MISUSE] and sets *ppValue to NULL. ** ** Argument iVal must be greater than or equal to 0, and less than the number ** of columns in the table affected by the current change. Otherwise, -** SQLITE_RANGE is returned and *ppValue is set to NULL. +** [SQLITE_RANGE] is returned and *ppValue is set to NULL. ** ** If successful, this function sets *ppValue to point to a protected ** sqlite3_value object containing the iVal'th value from the vector of @@ -354,13 +354,13 @@ int sqlite3changeset_new( ** ** This function should only be used with iterator objects passed to a ** conflict-handler callback by [sqlite3changeset_apply()] with either -** SQLITE_CHANGESET_DATA or SQLITE_CHANGESET_CONFLICT. If this function -** is called on any other iterator, SQLITE_MISUSE is returned and *ppValue +** [SQLITE_CHANGESET_DATA] or [SQLITE_CHANGESET_CONFLICT]. If this function +** is called on any other iterator, [SQLITE_MISUSE] is returned and *ppValue ** is set to NULL. ** ** Argument iVal must be greater than or equal to 0, and less than the number ** of columns in the table affected by the current change. Otherwise, -** SQLITE_RANGE is returned and *ppValue is set to NULL. +** [SQLITE_RANGE] is returned and *ppValue is set to NULL. ** ** If successful, this function sets *ppValue to point to a protected ** sqlite3_value object containing the iVal'th value from the @@ -381,17 +381,17 @@ int sqlite3changeset_conflict( ** CAPI3REF: Finalize a Changeset Iterator ** ** This function is used to finalize an iterator allocated with -** sqlite3changeset_start(). +** [sqlite3changeset_start()]. ** ** This function should only be called on iterators created using the ** [sqlite3changeset_start()] function. If an application calls this ** function with an iterator passed to a conflict-handler by -** [sqlite3changeset_apply()], SQLITE_MISUSE is immediately returned and the +** [sqlite3changeset_apply()], [SQLITE_MISUSE] is immediately returned and the ** call has no effect. ** ** If an error was encountered within a call to an sqlite3changeset_xxx() -** function (for example an SQLITE_CORRUPT in sqlite3changeset_next() or an -** SQLITE_NOMEM in sqlite3changeset_new()) then an error code corresponding +** function (for example an [SQLITE_CORRUPT] in [sqlite3changeset_next()] or an +** [SQLITE_NOMEM] in [sqlite3changeset_new()]) then an error code corresponding ** to that error is returned by this function. Otherwise, SQLITE_OK is ** returned. This is to allow the following pattern (pseudo-code): ** diff --git a/manifest b/manifest index 7a06b76e97..b318127f95 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Documentation\sformat\supdates\sto\ssqlite3session.h. -D 2011-03-20T11:20:41 +C Fix\ssome\stypos\sin\ssqlite3session.h. +D 2011-03-21T07:23:09 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 27701a1653595a1f2187dc61c8117e00a6c1d50f F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -102,7 +102,7 @@ F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024 F ext/session/session1.test 3f982c74ee4ba97069917cc35aae25b4ed858e6a F ext/session/session2.test 96ff08995ab9935d1992ac554a240052883a0ebc F ext/session/sqlite3session.c d211ce2e95483dfc144494f6c67879d85dddabfa -F ext/session/sqlite3session.h 3b99c2498ca86c8d45b29d3956225e09faabc414 +F ext/session/sqlite3session.h b77b014793162a77ac16507d720fe085cc15d06c F ext/session/test_session.c 2559ef68e421c7fb83e2c19ef08a17343b70d535 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 @@ -921,7 +921,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P ad91d30073a8faa7eb064dd2e1cc4d2297d7b3f8 -R b83a18c2f45208301f57e8f22417178c +P f227f60210fba3930f3050aebb1facee8bac9c0b +R 1d7fc8f92183ec1b52bc0fb00c30936f U dan -Z e800e514ce176ffa56c1f9535016cce8 +Z c7cce5161a77eeb6aa8085cb909dead1 diff --git a/manifest.uuid b/manifest.uuid index c0fb35d699..781e099e42 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f227f60210fba3930f3050aebb1facee8bac9c0b \ No newline at end of file +0853e530cc8d96f025f5160540e8ab3243dea11b \ No newline at end of file