Fix harmless compiler warnings.

FossilOrigin-Name: 20b75460c0661b5dc071177b4a0791aceccda029

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 318a927087fa2154d80559276352aead4c2db455..1676fd41e1497be467b5cf8d99b3b4f329e30272 100644 (file)
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -1376,7 +1376,7 @@ static int fts3InitVtab(
     int n = (int)strlen(p->azColumn[iCol]);
     for(i=0; i<nNotindexed; i++){
       char *zNot = azNotindexed[i];
-      if( zNot && strlen(zNot)==n 
+      if( zNot && n==(int)strlen(zNot)
        && 0==sqlite3_strnicmp(p->azColumn[iCol], zNot, n) 
       ){
         p->abNotindexed[iCol] = 1;

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index ea3c08802af6104ae11754e7bb100f12b9239358..72df64f26b81c31e73163e48a93d39b284ded6aa 100644 (file)
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -3065,7 +3065,7 @@ static int fts3PromoteSegments(
     sqlite3_bind_int64(pRange, 1, iAbsLevel+1);
     sqlite3_bind_int64(pRange, 2, iLast);
     while( SQLITE_ROW==sqlite3_step(pRange) ){
-      i64 nSize, dummy;
+      i64 nSize = 0, dummy;
       fts3ReadEndBlockField(pRange, 2, &dummy, &nSize);
       if( nSize<=0 || nSize>nLimit ){
         /* If nSize==0, then the %_segdir.end_block field does not not 
@@ -4870,7 +4870,7 @@ int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){
       rc = fts3IncrmergeOutputIdx(p, iAbsLevel, &iIdx);
       assert( bUseHint==1 || bUseHint==0 );
       if( iIdx==0 || (bUseHint && iIdx==1) ){
-        int bIgnore;
+        int bIgnore = 0;
         rc = fts3SegmentIsMaxLevel(p, iAbsLevel+1, &bIgnore);
         if( bIgnore ){
           pFilter->flags |= FTS3_SEGMENT_IGNORE_EMPTY;

diff --git a/manifest b/manifest
index 0de865b6a44b01fb1ad108af111cdf32be7748aa..937dcd73692b77254602156c7265c00b1a9dd2a3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sname\sof\sthe\sIndex.autoIndex\sfield\sto\sIndex.idxType\sand\sprovide\nsymbolic\snames\sfor\sthe\svarious\svalues\sof\sthat\sfield\srather\sthan\susing\nmagic\snumbers.
-D 2014-05-27T18:18:58.025
+C Fix\sharmless\scompiler\swarnings.
+D 2014-05-27T19:18:36.162
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -78,7 +78,7 @@ F ext/fts3/README.content fdc666a70d5257a64fee209f97cf89e0e6e32b51
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c 0a9813c01ce7cc33d63680725ea30755d77c7b39
+F ext/fts3/fts3.c 20bc65862cfcea0a39bb64a819f8fe92a8e144c1
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h 16cddf2d7b0e5f3681615ae1d8ca0e45fca44918
 F ext/fts3/fts3_aux.c 5c211e17a64885faeb16b9ba7772f9d5445c2365
@@ -96,7 +96,7 @@ F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
 F ext/fts3/fts3_unicode.c 92391b4b4fb043564c6539ea9b8661e3bcba47b9
 F ext/fts3/fts3_unicode2.c 0113d3acf13429e6dc38e0647d1bc71211c31a4d
-F ext/fts3/fts3_write.c 9e4e8579ad26cff3ee7743aaf5c3fe937fc441b4
+F ext/fts3/fts3_write.c 5ee9d894da74a5d15a3c317414fb8c84f1694fa4
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/fts3/tool/fts3view.c 6cfc5b67a5f0e09c0d698f9fd012c784bfaa9197
@@ -1171,9 +1171,9 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
-F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
+F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9c785c58327e08dad94a278a643a5443f94aec36
-R 58924fd70359b2c52e2bf8678fd7d495
+P d16e575dacc811de0f7b58a0d1cd243678dce6c5
+R b87af21bb1b8599ff9f8b8b0d9487163
 U drh
-Z 5d9af4bfdc2c3042e69c13bc9e203142
+Z 6454dd72a172141a989aefb8a68747be

diff --git a/manifest.uuid b/manifest.uuid
index 49de0b740542d9011072c42287e68d219b626693..626f68ec679d8316d5be9cdce9e25d4da3fe600a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d16e575dacc811de0f7b58a0d1cd243678dce6c5
\ No newline at end of file
+20b75460c0661b5dc071177b4a0791aceccda029
\ No newline at end of file

diff --git a/tool/warnings.sh b/tool/warnings.sh
index 246bccbe23a4fbdab5777892fc201b376b1e4779..5d71361138d7d19475d852bd3a69e5b80776c266 100644 (file)
--- a/tool/warnings.sh
+++ b/tool/warnings.sh
@@ -4,7 +4,7 @@
 # compiler warnings in SQLite.
 #
 rm -f sqlite3.c
-make sqlite3.c-debug
+make sqlite3.c
 echo '********** No optimizations.  Includes FTS4 and RTREE *********'
 gcc -c -Wshadow -Wall -Wextra -pedantic-errors -Wno-long-long -std=c89 \
       -ansi -DHAVE_STDINT_H -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE \