Fix some warnings under MSVC in fts3 module.

FossilOrigin-Name: c7771c0b22f2b45a47070cf84b9ecf1011e40404

diff --git a/configure b/configure
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 2906bb16627de1f0303f751d98817c50e263effe..4391e323783d1e225b819bda3095413bf1107ef1 100644 (file)
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -656,7 +656,7 @@ static int fts3IsSpecialColumn(
     zCsr++;
   }
 
-  *pnKey = zCsr-z;
+  *pnKey = (int)(zCsr-z);
   zValue = sqlite3_mprintf("%s", &zCsr[1]);
   if( zValue ){
     sqlite3Fts3Dequote(zValue);
@@ -711,7 +711,7 @@ static int fts3InitVtab(
 
   aCol = (const char **)sqlite3_malloc(sizeof(const char *) * (argc-2) );
   if( !aCol ) return SQLITE_NOMEM;
-  memset(aCol, 0, sizeof(const char *) * (argc-2));
+  memset((void *)aCol, 0, sizeof(const char *) * (argc-2));
 
   /* Loop through all of the arguments passed by the user to the FTS3/4
   ** module (i.e. all the column names and special arguments). This loop
@@ -843,7 +843,7 @@ static int fts3InitVtab(
 
 fts3_init_out:
 
-  sqlite3_free(aCol);
+  sqlite3_free((void *)aCol);
   if( rc!=SQLITE_OK ){
     if( p ){
       fts3DisconnectMethod((sqlite3_vtab *)p);
@@ -2199,7 +2199,7 @@ static void fts3DoclistStripPositions(
       pOut += sqlite3Fts3PutVarint(pOut, delta);
     }
 
-    *pnList = (pOut - aList);
+    *pnList = (int)(pOut - aList);
   }
 }
 

diff --git a/ext/fts3/fts3_snippet.c b/ext/fts3/fts3_snippet.c
index a288ff8977717c463c1468630bbf04a88b05c74a..94dcad5fbc16356940524c494c085c806bd6f0c6 100644 (file)
--- a/ext/fts3/fts3_snippet.c
+++ b/ext/fts3/fts3_snippet.c
@@ -1032,12 +1032,12 @@ static int fts3LcsIteratorAdvance(LcsIterator *pIter){
   }else{
     if( iRead==1 ){
       pRead += sqlite3Fts3GetVarint(pRead, &iRead);
-      pIter->iCol = iRead;
+      pIter->iCol = (int)iRead;
       pIter->iPos = pIter->iPosOffset;
       pRead += sqlite3Fts3GetVarint(pRead, &iRead);
       rc = 1;
     }
-    pIter->iPos += (iRead-2);
+    pIter->iPos += (int)(iRead-2);
   }
 
   pIter->pRead = pRead;
@@ -1186,7 +1186,7 @@ static int fts3MatchinfoValues(
             for(iCol=0; iCol<pInfo->nCol; iCol++){
               sqlite3_int64 nToken;
               a += sqlite3Fts3GetVarint(a, &nToken);
-              pInfo->aMatchinfo[iCol] = ((u32)(nToken&0xffffffff)+nDoc/2)/nDoc;
+              pInfo->aMatchinfo[iCol] = (u32)(((u32)(nToken&0xffffffff)+nDoc/2)/nDoc);
             }
           }
         }
@@ -1289,7 +1289,7 @@ static int fts3GetMatchinfo(
     }
 
     /* Allocate space for Fts3Cursor.aMatchinfo[] and Fts3Cursor.zMatchinfo. */
-    nArg = strlen(zArg);
+    nArg = (int)strlen(zArg);
     pCsr->aMatchinfo = (u32 *)sqlite3_malloc(sizeof(u32)*nMatchinfo + nArg + 1);
     if( !pCsr->aMatchinfo ) return SQLITE_NOMEM;
 

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 6d14a37180f14693bacea2d3fb67efff0c680fa6..9b3d9ba7a009bc2cdb42078adc51c67b9f61c316 100644 (file)
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -1116,7 +1116,7 @@ int sqlite3Fts3SegReaderCost(
           }
         }
 
-        pCsr->nRowAvg = (((nByte / nDoc) + pgsz - 1) / pgsz);
+        pCsr->nRowAvg = (int)(((nByte / nDoc) + pgsz - 1) / pgsz);
       }
       rc = sqlite3_reset(pStmt);
       if( rc!=SQLITE_OK || pCsr->nRowAvg==0 ) return rc;

diff --git a/install-sh b/install-sh
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/manifest b/manifest
index 9673457382768a99fab965c4d8bb177f4c44db4e..4166b59ad4e2b143c611a40d5420e60f1004ccc9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\sfile\se_resolve.test.
-D 2010-12-01T11:46:53
+C Fix\ssome\swarnings\sunder\sMSVC\sin\sfts3\smodule.
+D 2010-12-01T15:36:01
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -22,7 +22,7 @@ F art/src_logo.gif 9341ef09f0e53cd44c0c9b6fc3c16f7f3d6c2ad9
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 868fdb48c028421a203470e15c69ada15b9ba673
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure daed6cfdb4c1449a4335b3eeddc0d836e33fb54e x
+F configure daed6cfdb4c1449a4335b3eeddc0d836e33fb54e
 F configure.ac 699040cc9abb7465dca5a2972bc89d227fd8f734
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
@@ -61,7 +61,7 @@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c bae65cf771cd2c1dbcc972b064f770737cdbfca4
+F ext/fts3/fts3.c c354e8a4110c781cecfcba2f25026087159d5e47
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h a6c69c1c5e2c8c19172ddff42d262c087dcd7337
 F ext/fts3/fts3_expr.c 5f49e0deaf723724b08100bb3ff40aab02ad0c93
@@ -69,11 +69,11 @@ F ext/fts3/fts3_hash.c 3c8f6387a4a7f5305588b203fa7c887d753e1f1c
 F ext/fts3/fts3_hash.h 8331fb2206c609f9fc4c4735b9ab5ad6137c88ec
 F ext/fts3/fts3_icu.c ac494aed69835008185299315403044664bda295
 F ext/fts3/fts3_porter.c d61cfd81fb0fd8fbcb25adcaee0ba671aefaa5c2
-F ext/fts3/fts3_snippet.c 1d827175e9bf3ae58d608a43ce2a7ac89d5bbe0c
+F ext/fts3/fts3_snippet.c 6c87b55965124920d6461d79ea44b22cc3f307aa
 F ext/fts3/fts3_tokenizer.c 055f3dc7369585350b28db1ee0f3b214dca6724d
 F ext/fts3/fts3_tokenizer.h 13ffd9fcb397fec32a05ef5cd9e0fa659bf3dbd3
 F ext/fts3/fts3_tokenizer1.c 6e5cbaa588924ac578263a598e4fb9f5c9bb179d
-F ext/fts3/fts3_write.c 9d254e1baf4ed7ebebef8dbf1ec21cbdb611d1f6
+F ext/fts3/fts3_write.c 13012755d59e5d4f09a41fd3b5ad17de7dafe3e7
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
@@ -97,7 +97,7 @@ F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
 F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
-F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
+F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F main.mk 05d0f3475dd331896bd607cfb45c5e21b94589ad
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
@@ -892,7 +892,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 119ffe955eb1e8016cb8131a63bd17557f395f3f
-R 09a5e077c7ee06fdb8b9a9294977b8ce
-U dan
-Z abca49276b61190e4651e737a362dec8
+P 6858df9c72b1e9fb6c1a0050035b11822f87a5a7
+R a2456c787087ecdfc1bfcb7b9831ea34
+U shaneh
+Z b6022cecd366b0ea4a947c5fe471bbc9

diff --git a/manifest.uuid b/manifest.uuid
index 5ac8e71dc038762b9189d898a7d45d7c2712b063..4710d0a1bf0f393471bb35fa0bc24251a193ba24 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6858df9c72b1e9fb6c1a0050035b11822f87a5a7
\ No newline at end of file
+c7771c0b22f2b45a47070cf84b9ecf1011e40404
\ No newline at end of file