From: dan <dan@noemail.net>
Date: Mon, 14 Dec 2009 14:49:57 +0000 (+0000)
Subject: Fix a broken assert() in fts3_write.c. Also fix a couple of compiler warnings in... 
X-Git-Tag: version-3.7.2~702
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=971742058fdbc75e90d2427a79e12534d1b1b403;p=thirdparty%2Fsqlite.git

Fix a broken assert() in fts3_write.c. Also fix a couple of compiler warnings in fts3 code.

FossilOrigin-Name: a730a05b39c45138765df98d34b9db1ab4e72152
---

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index a66c776dd8..6330c4c82c 100644
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -2066,7 +2066,6 @@ static void fts3OffsetsFunc(
   sqlite3_value **apVal           /* Array of arguments */
 ){
   Fts3Cursor *pCsr;               /* Cursor handle passed through apVal[0] */
-  int rc;
 
   UNUSED_PARAMETER(nVal);
 
diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 1a48f385e0..8a8f18a4ae 100644
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -1959,7 +1959,7 @@ int sqlite3Fts3SegReaderIterate(
       nMerge++;
     }
 
-    assert( isIgnoreEmpty==0 || (isRequirePos && isColFilter==0) );
+    assert( isIgnoreEmpty || (isRequirePos && !isColFilter) );
     if( nMerge==1 && !isIgnoreEmpty ){
       Fts3SegReader *p0 = apSegment[0];
       rc = xFunc(p, pContext, zTerm, nTerm, p0->aDoclist, p0->nDoclist);
@@ -2221,7 +2221,7 @@ int sqlite3Fts3PendingTermsFlush(Fts3Table *p){
 */
 static int fts3SpecialInsert(Fts3Table *p, sqlite3_value *pVal){
   int rc;                         /* Return Code */
-  const char *zVal = sqlite3_value_text(pVal);
+  const char *zVal = (const char *)sqlite3_value_text(pVal);
   int nVal = sqlite3_value_bytes(pVal);
 
   if( !zVal ){
diff --git a/manifest b/manifest
index a02ffabf6c..3d92aa9819 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Additional\scorrections\sto\sdocumentation\scomments.\s\sNo\sfunctional\scode\schanges.
-D 2009-12-13T23:03:02
+C Fix\sa\sbroken\sassert()\sin\sfts3_write.c.\sAlso\sfix\sa\scouple\sof\scompiler\swarnings\sin\sfts3\scode.
+D 2009-12-14T14:49:57
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -59,7 +56,7 @@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c ea601b21f6bcaab4035804993328a9f0231ec6cb
+F ext/fts3/fts3.c 6ae94945dd95557b86b025db907b2ca95e54c7e0
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h 6fdd41b4f296e5bcc908444dc591397995d4ff5d
 F ext/fts3/fts3_expr.c fcf6812dbfd9cb9a2cabaf50e741411794f83e7e
@@ -71,7 +68,7 @@ F ext/fts3/fts3_snippet.c 6c2eb6d872d66b2a9aa5663f2662e993f18a6496
 F ext/fts3/fts3_tokenizer.c 1a49ee3d79cbf0b9386250370d9cbfe4bb89c8ff
 F ext/fts3/fts3_tokenizer.h 7ff73caa3327589bf6550f60d93ebdd1f6a0fb5c
 F ext/fts3/fts3_tokenizer1.c 11a604a53cff5e8c28882727bf794e5252e5227b
-F ext/fts3/fts3_write.c c2e0ef39df121b291fda42992ef1387f7938dea1
+F ext/fts3/fts3_write.c 2847b13da9e00016b81ea4b80ff5a298e55bc32d
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/icu/README.txt 3b130aa66e7a681136f6add198b076a2f90d1e33
 F ext/icu/icu.c 12e763d288d23b5a49de37caa30737b971a2f1e2
@@ -782,14 +779,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 6ae7e40ba0f710609cf1bc8baa54e7839eb7a2d7
-R 90075cb5cbdb6496cbcd717823123afc
-U drh
-Z bc330dbb16a05ad10d16e1183cfdde57
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFLJXKqoxKgR168RlERAp5SAJ9cZPHwRfzOB5xQpWbeMAZaxQwaQQCZAcP6
-Al2UFUxQ40MFZXwMPsWgE9c=
-=5w8u
------END PGP SIGNATURE-----
+P b3740b0aa0a7c6932e33e02b37baed5a5960a0bd
+R 1c3b2b5f783095efeeae9d3fc23b029c
+U dan
+Z fbab6b388dda107b430b70cf162bec4b
diff --git a/manifest.uuid b/manifest.uuid
index 95d8e6b44d..289450ba88 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b3740b0aa0a7c6932e33e02b37baed5a5960a0bd
\ No newline at end of file
+a730a05b39c45138765df98d34b9db1ab4e72152
\ No newline at end of file