Fix some harmess compiler warnings in the FTS3 Unicode module.

FossilOrigin-Name: c01caea5d6ad7a570628b85fb3056ac955ff03dd

diff --git a/ext/fts3/fts3_unicode.c b/ext/fts3/fts3_unicode.c
index 591cbb8dc9b0ec5cb340b68b4d4f158c3f6a272b..57e7a4d3c91a84126271964af2d01d482a0c8429 100644 (file)
--- a/ext/fts3/fts3_unicode.c
+++ b/ext/fts3/fts3_unicode.c
@@ -231,7 +231,7 @@ static int unicodeCreate(
 
   for(i=0; rc==SQLITE_OK && i<nArg; i++){
     const char *z = azArg[i];
-    int n = strlen(z);
+    int n = (int)strlen(z);
 
     if( n==19 && memcmp("remove_diacritics=1", z, 19)==0 ){
       pNew->bRemoveDiacritic = 1;
@@ -363,11 +363,11 @@ static int unicodeNext(
   );
 
   /* Set the output variables and return. */
-  pCsr->iOff = (z - pCsr->aInput);
+  pCsr->iOff = (int)(z - pCsr->aInput);
   *paToken = pCsr->zToken;
-  *pnToken = zOut - pCsr->zToken;
-  *piStart = (zStart - pCsr->aInput);
-  *piEnd = (zEnd - pCsr->aInput);
+  *pnToken = (int)(zOut - pCsr->zToken);
+  *piStart = (int)(zStart - pCsr->aInput);
+  *piEnd = (int)(zEnd - pCsr->aInput);
   *piPos = pCsr->iToken++;
   return SQLITE_OK;
 }

diff --git a/manifest b/manifest
index 8160c091551683d061a5d956a4a2f94bf5a946ca..59d0b2b6014f9c3690f9fad1f7c87dc2d895bf8e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\swarnings\srelated\sto\shaving\sa\s64-bit\ssize_t.
-D 2014-07-19T15:40:39.591
+C Fix\ssome\sharmess\scompiler\swarnings\sin\sthe\sFTS3\sUnicode\smodule.
+D 2014-07-19T15:44:29.116
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -94,7 +94,7 @@ F ext/fts3/fts3_tokenize_vtab.c 011170fe9eba5ff062f1a31d3188e00267716706
 F ext/fts3/fts3_tokenizer.c bbdc731bc91338050675c6d1da9ab82147391e16
 F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
-F ext/fts3/fts3_unicode.c 0f598fa4c96af1188e4d5f5e8e78e25500bd5922
+F ext/fts3/fts3_unicode.c e80eef8a11f2020dc9c1eb95c5b405b9012f2fbe
 F ext/fts3/fts3_unicode2.c c8adda75aad0c6c252ef3dd555f811f437485044
 F ext/fts3/fts3_write.c 8260388626516a7005d06a9dce94f9e55c6c2a41
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
@@ -1182,7 +1182,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 89634a419d0c1ef899d0591c7c6ab9290bf665d2
-R 7c73c160afe9efe974113734dfcd1ed9
+P 29ac9336dba2b62d13315cecfc5c4a74cc54087a
+R 4ac50ab96ea64a1527703075acfe4ff2
 U mistachkin
-Z 6a0ee89ac8bea8d9e5f887e8d36032b1
+Z ef640c9ada5ada1862dacc56c6ab494a

diff --git a/manifest.uuid b/manifest.uuid
index 6eee24a63af3a93a3673b1e9c8971d559cdc726a..e4b4c3f4792e97f031a76f64cb058af5fdd0ecb6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-29ac9336dba2b62d13315cecfc5c4a74cc54087a
\ No newline at end of file
+c01caea5d6ad7a570628b85fb3056ac955ff03dd
\ No newline at end of file