From: dan <dan@noemail.net>
Date: Wed, 29 Jul 2015 14:58:47 +0000 (+0000)
Subject: Update comments in fts5.h describing the xColumnCount() API function.
X-Git-Tag: version-3.8.11.1~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f43df31b5c3f9a746c8d7e1f2919529eccf2433;p=thirdparty%2Fsqlite.git

Update comments in fts5.h describing the xColumnCount() API function.

FossilOrigin-Name: a623eb55d1583bcfe360a8dabd29f2a583c61e64
---

diff --git a/ext/fts5/fts5.h b/ext/fts5/fts5.h
index d9b30c620d..b8fa3e7120 100644
--- a/ext/fts5/fts5.h
+++ b/ext/fts5/fts5.h
@@ -60,8 +60,16 @@ typedef void (*fts5_extension_function)(
 **   an OOM condition or IO error), an appropriate SQLite error code is 
 **   returned.
 **
-** xColumnCount:
-**   Returns the number of columns in the FTS5 table.
+** xColumnCount(pFts, iCol, pnToken):
+**   If parameter iCol is less than zero, set output variable *pnToken
+**   to the total number of tokens in the current row. Or, if iCol is
+**   non-negative but less than the number of columns in the table, set
+**   *pnToken to the number of tokens in column iCol of the current row.
+**
+**   If parameter iCol is greater than or equal to the number of columns
+**   in the table, SQLITE_RANGE is returned. Or, if an error occurs (e.g.
+**   an OOM condition or IO error), an appropriate SQLite error code is 
+**   returned.
 **
 ** xColumnSize:
 **   Reports the size in tokens of a column value from the current row.
diff --git a/manifest b/manifest
index 427414cf47..20558bd160 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sxfer\soptimization\sfor\sWITHOUT\sROWID\stables\sso\sthat\sit\scorrectly\nupdates\sthe\schange\scount\sreturned\sby\ssqlite3_changes().
-D 2015-07-28T18:53:37.424
+C Update\scomments\sin\sfts5.h\sdescribing\sthe\sxColumnCount()\sAPI\sfunction.
+D 2015-07-29T14:58:47.798
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4de3ef40c8b3b75c0c55ff4242a43c8ce1ad90ee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -105,7 +105,7 @@ F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7
 F ext/fts3/unicode/mkunicode.tcl 95cf7ec186e48d4985e433ff8a1c89090a774252
 F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95
 F ext/fts5/extract_api_docs.tcl 06583c935f89075ea0b32f85efa5dd7619fcbd03
-F ext/fts5/fts5.h 81d1a92fc2b4bd477af7e4e0b38b456f3e199fba
+F ext/fts5/fts5.h 65b8b308135ac6957fcb0f41b85240212e41099c
 F ext/fts5/fts5Int.h 4d669e2ef0f8d51380c78403fd310ee69ce0f70e
 F ext/fts5/fts5_aux.c 044cb176a815f4388308738437f6e130aa384fb0
 F ext/fts5/fts5_buffer.c 80f9ba4431848cb857e3d2158f5280093dcd8015
@@ -1366,7 +1366,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P c98175e900cdda0c81fb559fed4cc5f27c34e368
-R e96dcbd757ba5f6ebb95dab5feb99125
-U drh
-Z 39b41622c8bd60fb5611285cfd384da5
+P eff43715d1a3a9ce3fe5da194dbb76ec0c06e13c
+R 856c96af80d5201f19374f23ebd8c251
+U dan
+Z 01873dbb7ade1c793202762a942d94e3
diff --git a/manifest.uuid b/manifest.uuid
index 5cbd66c769..2422cc9d71 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eff43715d1a3a9ce3fe5da194dbb76ec0c06e13c
\ No newline at end of file
+a623eb55d1583bcfe360a8dabd29f2a583c61e64
\ No newline at end of file