From: dan <dan@noemail.net>
Date: Sat, 23 Jan 2016 15:57:06 +0000 (+0000)
Subject: Fix some signed/unsigned comparison compiler warnings in fts5.
X-Git-Tag: version-3.11.0~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c66d03f1e13e8f1746e063d642480cd951d4ca44;p=thirdparty%2Fsqlite.git

Fix some signed/unsigned comparison compiler warnings in fts5.

FossilOrigin-Name: 3be336aa893f9eb0837d7d66c83bab1489792b9a
---

diff --git a/ext/fts5/fts5Int.h b/ext/fts5/fts5Int.h
index b2f0d6c34e..5d7facc948 100644
--- a/ext/fts5/fts5Int.h
+++ b/ext/fts5/fts5Int.h
@@ -225,8 +225,8 @@ int sqlite3Fts5ConfigParseRank(const char*, char**, char**);
 typedef struct Fts5Buffer Fts5Buffer;
 struct Fts5Buffer {
   u8 *p;
-  u32 n;
-  u32 nSpace;
+  int n;
+  int nSpace;
 };
 
 int sqlite3Fts5BufferSize(int*, Fts5Buffer*, u32);
@@ -247,7 +247,7 @@ char *sqlite3Fts5Mprintf(int *pRc, const char *zFmt, ...);
 #define fts5BufferSet(a,b,c,d)        sqlite3Fts5BufferSet(a,b,c,d)
 
 #define fts5BufferGrow(pRc,pBuf,nn) ( \
-  (pBuf)->n + (nn) <= (pBuf)->nSpace ? 0 : \
+  (u32)((pBuf)->n) + (u32)(nn) <= (u32)((pBuf)->nSpace) ? 0 : \
     sqlite3Fts5BufferSize((pRc),(pBuf),(nn)+(pBuf)->n) \
 )
 
diff --git a/ext/fts5/fts5_buffer.c b/ext/fts5/fts5_buffer.c
index 94591188d3..9bd4fddb82 100644
--- a/ext/fts5/fts5_buffer.c
+++ b/ext/fts5/fts5_buffer.c
@@ -363,7 +363,7 @@ int sqlite3Fts5TermsetAdd(
 
 void sqlite3Fts5TermsetFree(Fts5Termset *p){
   if( p ){
-    int i;
+    u32 i;
     for(i=0; i<ArraySize(p->apHash); i++){
       Fts5TermsetEntry *pEntry = p->apHash[i];
       while( pEntry ){
diff --git a/manifest b/manifest
index 7b54ea0ab0..9f8ab447a0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sassert()\sthat\scan\sbe\sfalse\sif\scompiled\swith\sSQLITE_USE_ALLOCA.
-D 2016-01-23T14:05:27.109
+C Fix\ssome\ssigned/unsigned\scomparison\scompiler\swarnings\sin\sfts5.
+D 2016-01-23T15:57:06.186
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1708a78eda223b6daa302b140037fcc214a779f9
@@ -97,9 +97,9 @@ 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 5599703af9c13512900a9f22fec39d48078d619d
+F ext/fts5/fts5Int.h e4c7ca41a7841f180d78a24850757e0ffcb20f27
 F ext/fts5/fts5_aux.c 2dafc3aee0c70d643140c77d8d70daffa51a9e9e
-F ext/fts5/fts5_buffer.c 7d3f6f01f8fdc45204e6a33925ef8478a67d28dd
+F ext/fts5/fts5_buffer.c 0b8e1f84fec3ec01f7e17f8d4f17c46856b31e10
 F ext/fts5/fts5_config.c 0c384ebdd23fd055e2e50a93277b8d59da538238
 F ext/fts5/fts5_expr.c 4ab4504c54bbe24689c83411d8588f4ec99136e9
 F ext/fts5/fts5_hash.c 1b113977296cf4212c6ec667d5e3f2bd18036955
@@ -1419,7 +1419,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 a79c46bc61a35edbaf6112c26e8052314b0eb16a
-R 78c84a447f1adb3672b2aa032cc33ea6
-U drh
-Z 2d3baf83036e6553ecd28fa4c13c4bc2
+P f0a551edf87ef061deae34d88b02c3b484ae9adc
+R 962289f1674397e1ac71fafb409f527f
+U dan
+Z 5f630552e065d9e5a5f7f6919a0222d3
diff --git a/manifest.uuid b/manifest.uuid
index d11f7b73ef..e3c087f5fd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f0a551edf87ef061deae34d88b02c3b484ae9adc
\ No newline at end of file
+3be336aa893f9eb0837d7d66c83bab1489792b9a
\ No newline at end of file