Fix harmless compiler warnings in the FTS expression parser.

FossilOrigin-Name: 3c78af8c535e16518f18733325f4cd1df7ec8282

diff --git a/ext/fts3/fts3_expr.c b/ext/fts3/fts3_expr.c
index c767d7e71e21646c28a12c2a3af20e32986b3836..b28ab68e4b51279f83c8c10738859595e6775496 100644 (file)
--- a/ext/fts3/fts3_expr.c
+++ b/ext/fts3/fts3_expr.c
@@ -895,7 +895,7 @@ static int fts3ExprBalance(Fts3Expr **pp, int nMaxDepth){
         for(i=0; i<nMaxDepth; i++){
           sqlite3Fts3ExprFree(apLeaf[i]);
         }
-        while( pDel=pFree ){
+        while( (pDel=pFree)!=0 ){
           pFree = pDel->pParent;
           sqlite3_free(pDel);
         }
@@ -935,7 +935,6 @@ static int fts3ExprParseUnbalanced(
   const char *z, int n,               /* Text of MATCH query */
   Fts3Expr **ppExpr                   /* OUT: Parsed query structure */
 ){
-  static const int MAX_EXPR_DEPTH = 12;
   int nParsed;
   int rc;
   ParseContext sParse;

diff --git a/manifest b/manifest
index 31e42e1348b6290dd59e6543a27448dca464a2e7..e150e60d9338b5ca438cbb003f06e6fe6742dfba 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\schanges.
-D 2013-04-26T06:58:06.233
+C Fix\sharmless\scompiler\swarnings\sin\sthe\sFTS\sexpression\sparser.
+D 2013-04-26T13:14:19.396
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -59,7 +59,7 @@ F ext/fts3/fts3.c 784aadfb4c2a217c3eb1feaecac924989f29728f
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h 352c8a83ee4c6a14ced1759a39dd890ab947cbe0
 F ext/fts3/fts3_aux.c b02632f6dd0e375ce97870206d914ea6d8df5ccd
-F ext/fts3/fts3_expr.c a01c0a2e00d0e848f7cdda3b4114fe03b560f59b
+F ext/fts3/fts3_expr.c 4021d21aadebb50499c482f6b7b718e4b93113e6
 F ext/fts3/fts3_hash.c 8dd2d06b66c72c628c2732555a32bc0943114914
 F ext/fts3/fts3_hash.h 39cf6874dc239d6b4e30479b1975fe5b22a3caaf
 F ext/fts3/fts3_icu.c e319e108661147bcca8dd511cd562f33a1ba81b5
@@ -86,13 +86,13 @@ F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 F ext/misc/amatch.c 3369b2b544066e620d986f0085d039c77d1ef17f
 F ext/misc/closure.c fec0c8537c69843e0b7631d500a14c0527962cd6
 F ext/misc/editdist3.wiki 06100a0c558921a563cbc40e0d0151902b1eef6d
-F ext/misc/fuzzer.c fb64a15af978ae73fa9075b9b1dfbe82b8defc6f w src/test_fuzzer.c
+F ext/misc/fuzzer.c fb64a15af978ae73fa9075b9b1dfbe82b8defc6f
 F ext/misc/ieee754.c 2565ce373d842977efe0922dc50b8a41b3289556
 F ext/misc/nextchar.c 1131e2b36116ffc6fe6b2e3464bfdace27978b1e
-F ext/misc/regexp.c c25c65fe775f5d9801fb8573e36ebe73f2c0c2e0 w src/test_regexp.c
-F ext/misc/spellfix.c e323eebb877d735bc64404c16a6d758ab17a0b7a w src/test_spellfix.c
+F ext/misc/regexp.c c25c65fe775f5d9801fb8573e36ebe73f2c0c2e0
+F ext/misc/spellfix.c e323eebb877d735bc64404c16a6d758ab17a0b7a
 F ext/misc/spellfix1.wiki dd1830444c14cf0f54dd680cc044df2ace2e9d09
-F ext/misc/wholenumber.c ce362368b9381ea48cbd951ade8df867eeeab014 w src/test_wholenumber.c
+F ext/misc/wholenumber.c ce362368b9381ea48cbd951ade8df867eeeab014
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/rtree.c 757abea591d4ff67c0ff4e8f9776aeda86b18c14
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
@@ -1062,7 +1062,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P f968d43f80cc2f236e7d09ba1e8278343e2b6976 56b9a417f5451631f11c5206d625f11472ee65f9
-R 70b7c4a8fc1b35fd998a4752a3b57b39
-U dan
-Z 98b8c0af1d54867f961d6716e238405d
+P 4d08e74d34e82f3be588049c9576a5c1008435e7
+R a62e327052722b023f8b56bfc3226b16
+U drh
+Z 0ddc594c1b1b9290fe656a6228646bb0

diff --git a/manifest.uuid b/manifest.uuid
index 6ecc5686657afef113f17bc97dcfbd752060240e..157b4bd51019610773f897eae2f9e42253fdd6d0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4d08e74d34e82f3be588049c9576a5c1008435e7
\ No newline at end of file
+3c78af8c535e16518f18733325f4cd1df7ec8282
\ No newline at end of file