Fix harmless compiler warnings in FTS5.

FossilOrigin-Name: 0a903ec26bfbbe9bfd18bc34934e689ffdb01ce5

diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 6747b9387bbdbb9c402d40af748be207b27afb16..1628018b48db550cd43af313ea5a5023b0059019 100644 (file)
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -4360,7 +4360,7 @@ static void fts5SetupPrefixIter(
     Fts5IndexIter *p1 = 0;     /* Iterator used to gather data from index */
     Fts5Data *pData;
     Fts5Buffer doclist;
-    int bNewTerm;
+    int bNewTerm = 0;
 
     memset(&doclist, 0, sizeof(doclist));
     for(fts5MultiIterNew(p, pStruct, 1, flags, pToken, nToken, -1, 0, &p1);

diff --git a/ext/fts5/fts5_vocab.c b/ext/fts5/fts5_vocab.c
index 80e3455900917a380796db89b3aeecdb027e4d8a..1d13b9cd63d4e0b5e02ffbe4170ed3c3eb3f8889 100644 (file)
--- a/ext/fts5/fts5_vocab.c
+++ b/ext/fts5/fts5_vocab.c
@@ -462,7 +462,7 @@ static int fts5VocabFilterMethod(
   sqlite3_value **apVal           /* Arguments for the indexing scheme */
 ){
   Fts5VocabCursor *pCsr = (Fts5VocabCursor*)pCursor;
-  int rc;
+  int rc = SQLITE_OK;
 
   int iVal = 0;
   int f = FTS5INDEX_QUERY_SCAN;
@@ -479,16 +479,16 @@ static int fts5VocabFilterMethod(
   if( idxNum & FTS5_VOCAB_TERM_LE ) pLe = apVal[iVal++];
 
   if( pEq ){
-    zTerm = sqlite3_value_text(pEq);
+    zTerm = (const char *)sqlite3_value_text(pEq);
     nTerm = sqlite3_value_bytes(pEq);
     f = 0;
   }else{
     if( pGe ){
-      zTerm = sqlite3_value_text(pGe);
+      zTerm = (const char *)sqlite3_value_text(pGe);
       nTerm = sqlite3_value_bytes(pGe);
     }
     if( pLe ){
-      const char *zCopy = sqlite3_value_text(pLe);
+      const char *zCopy = (const char *)sqlite3_value_text(pLe);
       pCsr->nLeTerm = sqlite3_value_bytes(pLe);
       pCsr->zLeTerm = sqlite3_malloc(pCsr->nLeTerm+1);
       if( pCsr->zLeTerm==0 ){

diff --git a/manifest b/manifest
index d75668e6c41c27849a09bb92c22d80d4d872a137..e406cb4dc031bac103749d53048015ae950314c6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\soptimizations\sfor\sfts5\sprefix\squeries.
-D 2015-10-20T21:05:53.203
+C Fix\sharmless\scompiler\swarnings\sin\sFTS5.
+D 2015-10-20T23:27:14.365
 F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 4eb750e0fdf52050a06d881e1b060f4bb116ed7e
@@ -109,7 +109,7 @@ F ext/fts5/fts5_buffer.c 6d4082daa71eef87812b8caa9d60ae57a6a9ebc0
 F ext/fts5/fts5_config.c 88a77f5d5e4dfbb2355b8f6cc9969b7f02d94685
 F ext/fts5/fts5_expr.c 28b15c9ae296204bc0a2e5cf7a667d840a9d2900
 F ext/fts5/fts5_hash.c a9d4c1efebc2a91d26ad7ebdfcbf2678ceac405f
-F ext/fts5/fts5_index.c 45856922243dc5f9d5bdc3b677d68e27997df600
+F ext/fts5/fts5_index.c d3503c75d329f027140b855149566c97c078c18d
 F ext/fts5/fts5_main.c 520a29136ba07448331f73bdc36d0ffa1e9dcfef
 F ext/fts5/fts5_storage.c 8038a54a88d3beb94dc7f9db6428a3bc08b718bb
 F ext/fts5/fts5_tcl.c 3bf445e66de32137d4693694ff7b1fd6074e32bd
@@ -117,7 +117,7 @@ F ext/fts5/fts5_test_mi.c e96be827aa8f571031e65e481251dc1981d608bf
 F ext/fts5/fts5_tokenize.c 12c5d925286491a71bb3dad7c8924ce9cfd18320
 F ext/fts5/fts5_unicode2.c 78273fbd588d1d9bd0a7e4e0ccc9207348bae33c
 F ext/fts5/fts5_varint.c 3f86ce09cab152e3d45490d7586b7ed2e40c13f1
-F ext/fts5/fts5_vocab.c 4bf7e418bd3f857c7aea8221fc2c159283d30c6b
+F ext/fts5/fts5_vocab.c fc319264ebbf1b4518afd9cacd3801ac526536d8
 F ext/fts5/fts5parse.y e83dca6028e3309178d05b5bd920e372dc295d35
 F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
 F ext/fts5/test/fts5_common.tcl 51f7ef3af444b89c6f6ce3896a0ac349ff4e996d
@@ -1391,7 +1391,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 1f5f5804cd394a81b1c0712ce6d1052f228d0a40
-R 843f1263cb5ed99ae94cdac9953fa2b8
-U dan
-Z 0e003a47783a27c94ee2f0e7d256c7c6
+P b8fb263ed1b36d085437131795505e53af103d26
+R 95702bd1633e56deaa7f0c8cd9294ab7
+U mistachkin
+Z 2868708b35b26115fe25354e42651fac

diff --git a/manifest.uuid b/manifest.uuid
index c7f268a7a42251aac0b5cd9cbe42ab075356e211..ea64a17af2178f1e822503080f5f34b78f230113 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b8fb263ed1b36d085437131795505e53af103d26
\ No newline at end of file
+0a903ec26bfbbe9bfd18bc34934e689ffdb01ce5
\ No newline at end of file