From: drh <drh@noemail.net>
Date: Wed, 16 Sep 2020 16:55:56 +0000 (+0000)
Subject: Fix harmless compiler warnings in Lemon.
X-Git-Tag: version-3.34.0~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18ef40e563e12e58402f87e5e5710001005da0d8;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings in Lemon.

FossilOrigin-Name: 6c94ba4b1c16b676978808dcb24f63c2f22915af5dcfe9f635c037011affcf4b
---

diff --git a/manifest b/manifest
index 3134eb5f9b..b042ce968f 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbuffer\soverread\sfound\sby\sOSSFuzz\sthat\scould\soccur\sif\sa\sWITHOUT\sROWID\stable\swith\smany\scolumns\swas\sNATURAL\sJOINed\sagainst\sitself.
-D 2020-09-15T20:48:30.623
+C Fix\sharmless\scompiler\swarnings\sin\sLemon.
+D 2020-09-16T16:55:56.989
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1799,8 +1799,8 @@ F tool/genfkey.test b6afd7b825d797a1e1274f519ab5695373552ecad5cd373530c63533638a
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/index_usage.c f62a0c701b2c7ff2f3e21d206f093c123f222dbf07136a10ffd1ca15a5c706c5
 F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
-F tool/lemon.c 68f547dabafdaedafe2e253651122de33340486c169ae67087ab0eb4fbc8a646
-F tool/lempar.c dc1f5e8a0847c2257b0b069c61e290227062c4d75f5b5a0797b75b08b1c00405
+F tool/lemon.c 28a0641683fa8786dd52d401f2b99727a0137832ebe97d822de6a493fe658abc
+F tool/lempar.c 70243f14640759cb1a8f048024daa5e54505e80e79ec02bc979edfd1a7c5e810
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
@@ -1880,7 +1880,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1f5ed852f25515bbc0a7aaf236fdef40fa7e31805eee1249277fde4e68f95130
-R 159ee482f0e91b04b6a96e306747db16
-U dan
-Z 718c843037db5d7938afc4a375a76077
+P 3d35fa0be866213274fc09250225b345f6b08a9b4ec373d53d95e627e24512be
+R 27185f248a8d08f2569cea31fb11af65
+U drh
+Z d46cc13ad21ef0a53c46a80409f98715
diff --git a/manifest.uuid b/manifest.uuid
index eeab54a17c..c95d3e0fce 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3d35fa0be866213274fc09250225b345f6b08a9b4ec373d53d95e627e24512be
\ No newline at end of file
+6c94ba4b1c16b676978808dcb24f63c2f22915af5dcfe9f635c037011affcf4b
\ No newline at end of file
diff --git a/tool/lemon.c b/tool/lemon.c
index a18f0a2629..82531362e7 100644
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -1591,7 +1591,7 @@ static struct rule *Rule_merge(struct rule *pA, struct rule *pB){
 ** Sort a list of rules in order of increasing iRule value
 */
 static struct rule *Rule_sort(struct rule *rp){
-  int i;
+  unsigned int i;
   struct rule *pNext;
   struct rule *x[32];
   memset(x, 0, sizeof(x));
@@ -1625,8 +1625,7 @@ static void stats_line(const char *zLabel, int iValue){
 }
 
 /* The main program.  Parse the command line and do it... */
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv){
   static int version = 0;
   static int rpflag = 0;
   static int basisflag = 0;
@@ -1669,6 +1668,7 @@ int main(int argc, char **argv)
   struct lemon lem;
   struct rule *rp;
 
+  (void)argc;
   OptInit(argv,options,stderr);
   if( version ){
      printf("Lemon version 1.0\n");
@@ -2266,7 +2266,7 @@ static void parseonetoken(struct pstate *psp)
       psp->preccounter = 0;
       psp->firstrule = psp->lastrule = 0;
       psp->gp->nrule = 0;
-      /* Fall thru to next case */
+      /* fall through */
     case WAITING_FOR_DECL_OR_RULE:
       if( x[0]=='%' ){
         psp->state = WAITING_FOR_DECL_KEYWORD;
diff --git a/tool/lempar.c b/tool/lempar.c
index ef3148551e..079635b21f 100644
--- a/tool/lempar.c
+++ b/tool/lempar.c
@@ -559,7 +559,7 @@ static YYACTIONTYPE yy_find_shift_action(
 #endif /* YYWILDCARD */
       return yy_default[stateno];
     }else{
-      assert( i>=0 && i<sizeof(yy_action)/sizeof(yy_action[0]) );
+      assert( i>=0 && i<(int)(sizeof(yy_action)/sizeof(yy_action[0])) );
       return yy_action[i];
     }
   }while(1);