From: dan <dan@noemail.net>
Date: Thu, 14 Jan 2016 14:15:54 +0000 (+0000)
Subject: Fix compiler warnings in fts5.
X-Git-Tag: version-3.11.0~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f705e9deab4a18e9c5fd726a59226329e4674c95;p=thirdparty%2Fsqlite.git

Fix compiler warnings in fts5.

FossilOrigin-Name: 5a343cc0336bba056df4449e6cd2e3fb9e75a105
---

diff --git a/ext/fts5/fts5Int.h b/ext/fts5/fts5Int.h
index 1a3d57ca26..2a16ec065f 100644
--- a/ext/fts5/fts5Int.h
+++ b/ext/fts5/fts5Int.h
@@ -424,7 +424,6 @@ int sqlite3Fts5IndexSetAverages(Fts5Index *p, const u8*, int);
 /*
 ** Functions called by the storage module as part of integrity-check.
 */
-u64 sqlite3Fts5IndexCksum(Fts5Config*,i64,int,int,const char*,int);
 int sqlite3Fts5IndexIntegrityCheck(Fts5Index*, u64 cksum);
 
 /* 
diff --git a/ext/fts5/fts5_config.c b/ext/fts5/fts5_config.c
index fd6da7f11e..d9778bca20 100644
--- a/ext/fts5/fts5_config.c
+++ b/ext/fts5/fts5_config.c
@@ -379,7 +379,7 @@ static int fts5ConfigParseSpecial(
       { 0, 0 }
     };
 
-    if( rc = fts5ConfigSetEnum(aDetail, zArg, &pConfig->eDetail) ){
+    if( (rc = fts5ConfigSetEnum(aDetail, zArg, &pConfig->eDetail)) ){
       *pzErr = sqlite3_mprintf("malformed detail=... directive");
     }
     return rc;
diff --git a/ext/fts5/fts5_expr.c b/ext/fts5/fts5_expr.c
index 16209bf4ba..409fbd1d05 100644
--- a/ext/fts5/fts5_expr.c
+++ b/ext/fts5/fts5_expr.c
@@ -2428,7 +2428,7 @@ static int fts5ExprCheckPoslists(Fts5ExprNode *pNode, i64 iRowid){
             return 0;
           }
         }
-        return 1;
+        break;
       }
 
       case FTS5_OR: {
@@ -2453,10 +2453,11 @@ static int fts5ExprCheckPoslists(Fts5ExprNode *pNode, i64 iRowid){
           fts5ExprClearPoslists(pNode);
           return 0;
         }
-        return 1;
+        break;
       }
     }
   }
+  return 1;
 }
 
 void sqlite3Fts5ExprCheckPoslists(Fts5Expr *pExpr, i64 iRowid){
diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 2488cd7ca9..cc5b8ea521 100644
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -1772,8 +1772,6 @@ static void fts5SegIterNext_Reverse(
   if( pIter->iRowidOffset>0 ){
     u8 *a = pIter->pLeaf->p;
     int iOff;
-    int nPos;
-    int bDummy;
     i64 iDelta;
 
     pIter->iRowidOffset--;
@@ -1821,7 +1819,7 @@ static void fts5SegIterNext_None(
   if( iOff<pIter->iEndofDoclist ){
     /* Next entry is on the current page */
     i64 iDelta;
-    iOff += sqlite3Fts5GetVarint(&pIter->pLeaf->p[iOff], &iDelta);
+    iOff += sqlite3Fts5GetVarint(&pIter->pLeaf->p[iOff], (u64*)&iDelta);
     pIter->iLeafOffset = iOff;
     pIter->iRowid += iDelta;
   }else if( (pIter->flags & FTS5_SEGITER_ONETERM)==0 ){
diff --git a/ext/fts5/fts5_main.c b/ext/fts5/fts5_main.c
index ba8903c9a7..fec589efcb 100644
--- a/ext/fts5/fts5_main.c
+++ b/ext/fts5/fts5_main.c
@@ -310,13 +310,6 @@ static int fts5IsContentless(Fts5Table *pTab){
   return pTab->pConfig->eContent==FTS5_CONTENT_NONE;
 }
 
-/*
-** Return true if pTab is an offsetless table.
-*/
-static int fts5IsOffsetless(Fts5Table *pTab){
-  return pTab->pConfig->eDetail!=FTS5_DETAIL_FULL;
-}
-
 /*
 ** Delete a virtual table handle allocated by fts5InitVtab(). 
 */
diff --git a/manifest b/manifest
index 566a67eeac..7290cda6dc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\sRBU\sand\sadd\sRBU\sto\sthe\sautoconf\sand\swindows\nmakefiles.
-D 2016-01-14T13:22:24.150
+C Fix\scompiler\swarnings\sin\sfts5.
+D 2016-01-14T14:15:54.059
 F Makefile.in cfa1ac03c4b414992fd53f24d978b45b0c21de55
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1dc36cfd3c047c9685e539257e158485f16ef035
@@ -97,14 +97,14 @@ F ext/fts3/unicode/mkunicode.tcl 95cf7ec186e48d4985e433ff8a1c89090a774252
 F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95
 F ext/fts5/extract_api_docs.tcl a36e54ec777172ddd3f9a88daf593b00848368e0
 F ext/fts5/fts5.h ff9c2782e8ed890b0de2f697a8d63971939e70c7
-F ext/fts5/fts5Int.h 3918045ebceb1d600c9c1c1b460489ff0c788e96
+F ext/fts5/fts5Int.h 3a09b2eaeac2860d7afc59843796a9410f818ebf
 F ext/fts5/fts5_aux.c 2dafc3aee0c70d643140c77d8d70daffa51a9e9e
 F ext/fts5/fts5_buffer.c 87204c8b3b8bc62b27376eab09b74d6d5acc41f1
-F ext/fts5/fts5_config.c b0ed7b0ddd785fb4d4e6f9037d357f8aa95918e6
-F ext/fts5/fts5_expr.c 6eba2220747ea1b20a358fb3b34b2ab78323e285
+F ext/fts5/fts5_config.c 9c243d04ac0ca997d2d2e2252891f2a10fbd7217
+F ext/fts5/fts5_expr.c 510db45967ca359f64f2ba2c707ab57d740cad56
 F ext/fts5/fts5_hash.c 1b113977296cf4212c6ec667d5e3f2bd18036955
-F ext/fts5/fts5_index.c 5ab044a67919e2c9f42f0288a39778136154511e
-F ext/fts5/fts5_main.c 03bd44e4bd0ba16213ca9259ad5df1d4d743fd7e
+F ext/fts5/fts5_index.c 11e2b566b8b29fb42bb970969c92f3a33c2c1125
+F ext/fts5/fts5_main.c 488ceecdb4400ecc6a3d3b2247cedef153955388
 F ext/fts5/fts5_storage.c f7b2d330dd7b29a9f4da09f6d85879ca8c41b2e8
 F ext/fts5/fts5_tcl.c 18e9382d8cdad4c05b49559c68494968b9b4a4fb
 F ext/fts5/fts5_test_mi.c 1ec66ffdf7632077fbd773b7a6df5153272ec070
@@ -1412,7 +1412,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 74808a79ea3194f6cc00084b9dccc380846a6051
-R e29cff8691de1217f1757056bcfdb892
-U drh
-Z 1e6a858f101158e4efde76213bfd70e5
+P fabe78c5d8ab353988f6fe0decacd651edc17ec2
+R fee981891bfd69d76d7d5d050236b09c
+U dan
+Z 4d3da4cf65c48965923bd47b765f8e62
diff --git a/manifest.uuid b/manifest.uuid
index 6ea6f0c03c..3b2733f52b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fabe78c5d8ab353988f6fe0decacd651edc17ec2
\ No newline at end of file
+5a343cc0336bba056df4449e6cd2e3fb9e75a105
\ No newline at end of file