Fix harmless compiler warnings in FTS4.

FossilOrigin-Name: 1af4a25631c4077a9bfc64e15eb92fbf5146c89c

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 41791cb3cb13baad61e8feabd833b4700a25e33b..12013f2b722fa68b9654d61cc6d1a0ebac33b837 100644 (file)
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -1191,7 +1191,7 @@ static int fts3InitVtab(
     zCompress = 0;
     zUncompress = 0;
     if( nCol==0 ){
-      sqlite3_free(aCol); 
+      sqlite3_free((void*)aCol); 
       aCol = 0;
       rc = fts3ContentColumns(db, argv[1], zContent, &aCol, &nCol, &nString);
     }
@@ -1962,7 +1962,7 @@ static int fts3PoslistPhraseMerge(
   /* Never set both isSaveLeft and isExact for the same invocation. */
   assert( isSaveLeft==0 || isExact==0 );
 
-  assert( *p1!=0 && *p2!=0 );
+  assert( p!=0 && *p1!=0 && *p2!=0 );
   if( *p1==POS_COLUMN ){ 
     p1++;
     p1 += sqlite3Fts3GetVarint32(p1, &iCol1);
@@ -1997,6 +1997,7 @@ static int fts3PoslistPhraseMerge(
           iSave = isSaveLeft ? iPos1 : iPos2;
           fts3PutDeltaVarint(&p, &iPrev, iSave+2); iPrev -= 2;
           pSave = 0;
+          assert( p );
         }
         if( (!isSaveLeft && iPos2<=(iPos1+nToken)) || iPos2<=iPos1 ){
           if( (*p2&0xFE)==0 ) break;

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index d3a88cbe6168d8adc0902e2d024631645a913a1e..2904a9acaab1f82308bba756a3577b780a39b331 100644 (file)
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -2968,8 +2968,8 @@ static int fts3DoRebuild(Fts3Table *p){
   rc = fts3DeleteAll(p, 0);
   if( rc==SQLITE_OK ){
     u32 *aSz = 0;
-    u32 *aSzIns;
-    u32 *aSzDel;
+    u32 *aSzIns = 0;
+    u32 *aSzDel = 0;
     sqlite3_stmt *pStmt = 0;
     int nEntry = 0;
 

diff --git a/manifest b/manifest
index 17377c52ac1cfe0b4234e619cc29bcdaa365eb3b..f8cb18aeced9af26c020cfff9a54df401d686c80 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scomments\son\sSQLITE_CONFIG_HEAP\sso\sthat\sthey\sdo\snot\sinterfere\swith\sthe\nrequirements\sscanner.
-D 2011-10-19T17:13:08.805
+C Fix\sharmless\scompiler\swarnings\sin\sFTS4.
+D 2011-10-19T18:21:47.264
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in a162fe39e249b8ed4a65ee947c30152786cfe897
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -62,7 +62,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 9c125699baf1c03a3d8d53fb7d8d27ab4ad7d6eb
+F ext/fts3/fts3.c 246ef2d0cef67517d156d39c9247cd6c432f0d79
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h def7a900f98c5ab5fa4772e922bfa219d5097f05
 F ext/fts3/fts3_aux.c 0ebfa7b86cf8ff6a0861605fcc63b83ec1b70691
@@ -77,7 +77,7 @@ F ext/fts3/fts3_test.c 24fa13f330db011500acb95590da9eee24951894
 F ext/fts3/fts3_tokenizer.c 9ff7ec66ae3c5c0340fa081958e64f395c71a106
 F ext/fts3/fts3_tokenizer.h 13ffd9fcb397fec32a05ef5cd9e0fa659bf3dbd3
 F ext/fts3/fts3_tokenizer1.c 0dde8f307b8045565cf63797ba9acfaff1c50c68
-F ext/fts3/fts3_write.c f2545f59a4cc2eb6739acb3d026b8a91a1f3d429
+F ext/fts3/fts3_write.c c097228bff4d33c6b8a270c9717b9f8339068776
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/icu/README.txt bf8461d8cdc6b8f514c080e4e10dc3b2bbdfefa9
@@ -972,7 +972,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 8a4077057ddeb08e8edc5f20a75abaaba7a278ba
-R b6475ab92965b41fc368318dd410ee81
+P a3151ce15c256219646013d695b6e162e306cef8
+R c03f17b280572c2b36a89af35fc59d08
 U drh
-Z d1c63652bd6e0c53508e2b02187c5b10
+Z 9ceef528bc2e97c4ba4f48a0f47a964a

diff --git a/manifest.uuid b/manifest.uuid
index 61f55395f64c99b0683f481d887ded6f1a0714bb..6c18d5b13a4f413a862dbb8418f24b3439c928af 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a3151ce15c256219646013d695b6e162e306cef8
\ No newline at end of file
+1af4a25631c4077a9bfc64e15eb92fbf5146c89c
\ No newline at end of file