From: drh <drh@noemail.net>
Date: Tue, 10 Nov 2015 12:31:25 +0000 (+0000)
Subject: Fix harmless compiler warnings in FTS5.
X-Git-Tag: version-3.10.0~150^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fparser-enhancements;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings in FTS5.

FossilOrigin-Name: 09752e51a18ac1b4c9642965e6ee1b6a32de00df
---

diff --git a/ext/fts5/fts5_main.c b/ext/fts5/fts5_main.c
index ee5adc4b98..9390cb6cb2 100644
--- a/ext/fts5/fts5_main.c
+++ b/ext/fts5/fts5_main.c
@@ -874,7 +874,6 @@ static int fts5CursorFirstSorted(Fts5Table *pTab, Fts5Cursor *pCsr, int bDesc){
   int nPhrase;
   int nByte;
   int rc = SQLITE_OK;
-  char *zSql;
   const char *zRank = pCsr->zRank;
   const char *zRankArgs = pCsr->zRankArgs;
   
diff --git a/ext/fts5/fts5parse.y b/ext/fts5/fts5parse.y
index 065af77053..0e81771b4f 100644
--- a/ext/fts5/fts5parse.y
+++ b/ext/fts5/fts5parse.y
@@ -58,6 +58,18 @@
 */
 #define yytestcase(X) testcase(X)
 
+/*
+** Indicate that sqlite3ParserFree() will never be called with a null
+** pointer.
+*/
+#define YYPARSEFREENOTNULL 1
+
+/*
+** Alternative datatype for the argument to the malloc() routine passed
+** into sqlite3ParserAlloc().  The default is size_t.
+*/
+#define YYMALLOCARGTYPE  u64
+
 } // end %include
 
 %left OR.
@@ -168,7 +180,3 @@ phrase(A) ::= STRING(Y) star_opt(Z). {
 
 star_opt(A) ::= STAR. { A = 1; }
 star_opt(A) ::= . { A = 0; }
-
-
-
-
diff --git a/manifest b/manifest
index bef5b126ef..f9984ba6ea 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\senhancement\sto\sthe\stokenizer.
-D 2015-11-10T03:30:51.926
+C Fix\sharmless\scompiler\swarnings\sin\sFTS5.
+D 2015-11-10T12:31:25.172
 F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e928e68168df69b353300ac87c10105206653a03
@@ -110,7 +110,7 @@ F ext/fts5/fts5_config.c 6fc92c0b1bda5244c28a54c9ba740736bd5513d9
 F ext/fts5/fts5_expr.c 28b15c9ae296204bc0a2e5cf7a667d840a9d2900
 F ext/fts5/fts5_hash.c a9d4c1efebc2a91d26ad7ebdfcbf2678ceac405f
 F ext/fts5/fts5_index.c b622a0a70f57a96469e6828da2dd70e0872aeb37
-F ext/fts5/fts5_main.c 0569cd9fc18f3b56f6eeac601836df8ed5fb54cb
+F ext/fts5/fts5_main.c 7581280ee242785477df67402f2853c66f77d45b
 F ext/fts5/fts5_storage.c 9ea3d92178743758b6c54d9fe8836bbbdcc92e3b
 F ext/fts5/fts5_tcl.c 3bf445e66de32137d4693694ff7b1fd6074e32bd
 F ext/fts5/fts5_test_mi.c e96be827aa8f571031e65e481251dc1981d608bf
@@ -118,7 +118,7 @@ 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 3742d0abfe8aa8c3cb4a7df56aa38f2e3c3fb1c2
-F ext/fts5/fts5parse.y e83dca6028e3309178d05b5bd920e372dc295d35
+F ext/fts5/fts5parse.y 1647eba089b9b3fc058b4dc989d9da87d15b9580
 F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
 F ext/fts5/test/fts5_common.tcl 51f7ef3af444b89c6f6ce3896a0ac349ff4e996d
 F ext/fts5/test/fts5aa.test 2c553eea4dab4bc5a75928f56729277c7bc1d206
@@ -1402,7 +1402,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 3c37c522883ea9f2eec4f0ba5c5141912c003425
-R 40750d96ad92c103526c6bd35096918c
+P 6ea2df86c95c226052f528424e9bee367a2e765a
+R c4fc880f1c9308c0365b7757399767dc
 U drh
-Z 8ead9b7802f9e64a677105e8e10b5cbd
+Z 622f282d2cf652046e0082888bbfa948
diff --git a/manifest.uuid b/manifest.uuid
index be66b8946e..d47f9624b0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6ea2df86c95c226052f528424e9bee367a2e765a
\ No newline at end of file
+09752e51a18ac1b4c9642965e6ee1b6a32de00df
\ No newline at end of file