From: mistachkin <mistachkin@noemail.net>
Date: Wed, 21 Oct 2015 22:08:36 +0000 (+0000)
Subject: Fix harmless compiler warnings in FTS5.
X-Git-Tag: version-3.10.0~200
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16158eeb49f6de3a373cae5b41a4bbf3976432d7;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings in FTS5.

FossilOrigin-Name: aa4e01ea1af327d1f8398ebea1c5bacc46698c3d
---

diff --git a/ext/fts5/fts5Int.h b/ext/fts5/fts5Int.h
index 76b3ac3928..8626962067 100644
--- a/ext/fts5/fts5Int.h
+++ b/ext/fts5/fts5Int.h
@@ -225,7 +225,6 @@ struct Fts5Buffer {
 };
 
 int sqlite3Fts5BufferSize(int*, Fts5Buffer*, int);
-int sqlite3Fts5BufferGrow(int*, Fts5Buffer*, int);
 void sqlite3Fts5BufferAppendVarint(int*, Fts5Buffer*, i64);
 void sqlite3Fts5BufferAppendBlob(int*, Fts5Buffer*, int, const u8*);
 void sqlite3Fts5BufferAppendString(int *, Fts5Buffer*, const char*);
diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 6285fa9af3..e70bc85351 100644
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -5335,9 +5335,11 @@ int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum){
   Fts5IndexIter *pIter;           /* Used to iterate through entire index */
   Fts5Structure *pStruct;         /* Index structure */
 
+#ifdef SQLITE_DEBUG
   /* Used by extra internal tests only run if NDEBUG is not defined */
   u64 cksum3 = 0;                 /* Checksum based on contents of indexes */
   Fts5Buffer term = {0,0,0};      /* Buffer used to hold most recent term */
+#endif
   
   /* Load the FTS index structure */
   pStruct = fts5StructureRead(p);
@@ -5393,7 +5395,9 @@ int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum){
   if( p->rc==SQLITE_OK && cksum!=cksum2 ) p->rc = FTS5_CORRUPT;
 
   fts5StructureRelease(pStruct);
+#ifdef SQLITE_DEBUG
   fts5BufferFree(&term);
+#endif
   fts5BufferFree(&poslist);
   return fts5IndexReturn(p);
 }
diff --git a/ext/fts5/fts5_vocab.c b/ext/fts5/fts5_vocab.c
index 1d13b9cd63..860cfedb9b 100644
--- a/ext/fts5/fts5_vocab.c
+++ b/ext/fts5/fts5_vocab.c
@@ -180,7 +180,7 @@ static int fts5VocabInitVtab(
     const char *zType = bDb ? argv[5] : argv[4];
     int nDb = (int)strlen(zDb)+1; 
     int nTab = (int)strlen(zTab)+1;
-    int eType;
+    int eType = 0;
     
     rc = fts5VocabTableType(zType, pzErr, &eType);
     if( rc==SQLITE_OK ){
diff --git a/manifest b/manifest
index 7f4be2d02f..253f2f9505 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scompilation\sof\s'testfixture'\swith\sMSVC\swhen\sthe\sFTS5\sand\sJSON1\sextensions\sare\senabled.
-D 2015-10-21T22:07:25.256
+C Fix\sharmless\scompiler\swarnings\sin\sFTS5.
+D 2015-10-21T22:08:36.772
 F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
@@ -103,13 +103,13 @@ 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 8b9a13b309b180e9fb88ea5666c0d8d73c6102d9
-F ext/fts5/fts5Int.h dfe8390b65e84846e1bd7a2fccc076d350e83f8a
+F ext/fts5/fts5Int.h 06594fd3e5a3c74da6df9141e165975dc0ea6ef4
 F ext/fts5/fts5_aux.c 1f384972d606375b8fa078319f25ab4b5feb1b35
 F ext/fts5/fts5_buffer.c 1e49512a535045e621246dc7f4f65f3593fa0fc2
 F ext/fts5/fts5_config.c 88a77f5d5e4dfbb2355b8f6cc9969b7f02d94685
 F ext/fts5/fts5_expr.c 28b15c9ae296204bc0a2e5cf7a667d840a9d2900
 F ext/fts5/fts5_hash.c a9d4c1efebc2a91d26ad7ebdfcbf2678ceac405f
-F ext/fts5/fts5_index.c ffb95101cab310700ccedd641f4ac8a92b1bace8
+F ext/fts5/fts5_index.c 2bd3cb65b36160f7b411e70c4360d0619c965e4e
 F ext/fts5/fts5_main.c 520a29136ba07448331f73bdc36d0ffa1e9dcfef
 F ext/fts5/fts5_storage.c 8038a54a88d3beb94dc7f9db6428a3bc08b718bb
 F ext/fts5/fts5_tcl.c 3bf445e66de32137d4693694ff7b1fd6074e32bd
@@ -117,7 +117,7 @@ F ext/fts5/fts5_test_mi.c e96be827aa8f571031e65e481251dc1981d608bf
 F ext/fts5/fts5_tokenize.c 12c5d925286491a71bb3dad7c8924ce9cfd18320
 F ext/fts5/fts5_unicode2.c 78273fbd588d1d9bd0a7e4e0ccc9207348bae33c
 F ext/fts5/fts5_varint.c 3f86ce09cab152e3d45490d7586b7ed2e40c13f1
-F ext/fts5/fts5_vocab.c fc319264ebbf1b4518afd9cacd3801ac526536d8
+F ext/fts5/fts5_vocab.c 3742d0abfe8aa8c3cb4a7df56aa38f2e3c3fb1c2
 F ext/fts5/fts5parse.y e83dca6028e3309178d05b5bd920e372dc295d35
 F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
 F ext/fts5/test/fts5_common.tcl 51f7ef3af444b89c6f6ce3896a0ac349ff4e996d
@@ -1391,7 +1391,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 ae350bfbfd59f912c469a51bf7d1409f3c8d958a
-R 94370da87418177dbfd07035771f078a
+P e31aa97a9298e49507256036cfb8fa7517a48461
+R 606f7dfef62137a51a41fcb520dc155f
 U mistachkin
-Z b64a69f65dcbfbb052541ed7b4c602d1
+Z be7e8557e6be3b3a5f61a53f0769e842
diff --git a/manifest.uuid b/manifest.uuid
index fdefa58cb3..0399ec5e0b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e31aa97a9298e49507256036cfb8fa7517a48461
\ No newline at end of file
+aa4e01ea1af327d1f8398ebea1c5bacc46698c3d
\ No newline at end of file