From: dan <dan@noemail.net>
Date: Wed, 16 Mar 2016 19:53:58 +0000 (+0000)
Subject: Add a cast to an implict (size_t -> int) conversion in fts5_expr.c.
X-Git-Tag: version-3.12.0~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=377ba3842935e1629ea7cc5379716e084a25e54f;p=thirdparty%2Fsqlite.git

Add a cast to an implict (size_t -> int) conversion in fts5_expr.c.

FossilOrigin-Name: d9b5ff7aba3a8f6ca4505eac308fa9d510254c3e
---

diff --git a/ext/fts5/fts5_expr.c b/ext/fts5/fts5_expr.c
index 1e9be8117d..0bc61414b0 100644
--- a/ext/fts5/fts5_expr.c
+++ b/ext/fts5/fts5_expr.c
@@ -2500,7 +2500,7 @@ static int fts5ExprPopulatePoslistsCb(
     Fts5ExprTerm *pTerm;
     if( p->aPopulator[i].bOk==0 ) continue;
     for(pTerm=&pExpr->apExprPhrase[i]->aTerm[0]; pTerm; pTerm=pTerm->pSynonym){
-      int nTerm = strlen(pTerm->zTerm);
+      int nTerm = (int)strlen(pTerm->zTerm);
       if( (nTerm==nToken || (nTerm<nToken && pTerm->bPrefix))
        && memcmp(pTerm->zTerm, pToken, nTerm)==0
       ){
diff --git a/manifest b/manifest
index c10487dd6a..7a984cba21 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sLemon\sso\sthat\sit\sreorders\sthe\sreduce\srules\ssuch\sthat\srules\swithout\nactions\soccur\sat\sthe\send\sand\sso\sthat\sthe\sfirst\srule\sis\snumber\s0.\s\sThis\nreduces\sthe\ssize\sof\sthe\sjump\stable\son\sthe\sreduce\sswitch,\sand\shelps\sthe\sparser\nto\srun\sfaster.
-D 2016-03-16T19:45:54.638
+C Add\sa\scast\sto\san\simplict\s(size_t\s->\sint)\sconversion\sin\sfts5_expr.c.
+D 2016-03-16T19:53:58.157
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -102,7 +102,7 @@ F ext/fts5/fts5Int.h 4060504b7979601d99e1385c2b5713036854979a
 F ext/fts5/fts5_aux.c daa57fb45216491814520bbb587e97bf81ced458
 F ext/fts5/fts5_buffer.c 4c1502d4c956cd092c89ce4480867f9d8bf325cd
 F ext/fts5/fts5_config.c 5af9c360e99669d29f06492c370892394aba0857
-F ext/fts5/fts5_expr.c be309fb227003c931107bfcc12d5be4f2fd2bb8c
+F ext/fts5/fts5_expr.c 35e9d92c89e7c7ea0759b73d24da1ecb7630a24b
 F ext/fts5/fts5_hash.c f3a7217c86eb8f272871be5f6aa1b6798960a337
 F ext/fts5/fts5_index.c d4f0c12e4f04bbc3a06b6da052039f2ce3e45438
 F ext/fts5/fts5_main.c b8501e1a6a11591c53b18ce7aea7e5386cfb0421
@@ -1456,7 +1456,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P dbf84705913c0845ca4e75eb30c91536c754efeb
-R 864f536bc3cc564acb40b05c95555e64
-U drh
-Z 3c44460af79cebe8997bb55087f66950
+P d5712f21ec758ff096a7b1bb8ed4fc5ec400ca5d
+R 9f805acde28759cca26c223b9435e99d
+U dan
+Z 15773d15bd52be46557d40c4ca5e6748
diff --git a/manifest.uuid b/manifest.uuid
index 33a88b381b..4f9852189d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d5712f21ec758ff096a7b1bb8ed4fc5ec400ca5d
\ No newline at end of file
+d9b5ff7aba3a8f6ca4505eac308fa9d510254c3e
\ No newline at end of file