More harmless compiler warning fixes.

FossilOrigin-Name: 4c0d208c455abb983217a6dfea7634f677f8360fb57857e1421334fe7a5a23e2

diff --git a/ext/misc/decimal.c b/ext/misc/decimal.c
index e2c9d1ba8756d1dd30399299b3646950e2d80ffe..8db31a29dd391dd1882084029d20ae47797d3393 100644 (file)
--- a/ext/misc/decimal.c
+++ b/ext/misc/decimal.c
@@ -21,6 +21,12 @@ SQLITE_EXTENSION_INIT1
 #include <ctype.h>
 #include <stdlib.h>
 
+/* Mark a function parameter as unused, to suppress nuisance compiler
+** warnings. */
+#ifndef UNUSED_PARAMETER
+# define UNUSED_PARAMETER(X)  (void)(X)
+#endif
+
 
 /* A decimal object */
 typedef struct Decimal Decimal;
@@ -235,6 +241,7 @@ static void decimalFunc(
   sqlite3_value **argv
 ){
   Decimal *p = decimal_new(context, argv[0], 0, 0);
+  UNUSED_PARAMETER(argc);
   decimal_result(context, p);
   decimal_free(p);
 }
@@ -288,6 +295,7 @@ static void decimalCmpFunc(
   Decimal *pA = 0, *pB = 0;
   int rc;
 
+  UNUSED_PARAMETER(argc);
   pA = decimal_new(context, argv[0], 0, 0);
   if( pA==0 || pA->isNull ) goto cmp_done;
   pB = decimal_new(context, argv[1], 0, 0);
@@ -412,6 +420,7 @@ static int decimalCollFunc(
   Decimal *pA = decimal_new(0, 0, nKey1, zA);
   Decimal *pB = decimal_new(0, 0, nKey2, zB);
   int rc;
+  UNUSED_PARAMETER(notUsed);
   if( pA==0 || pB==0 ){
     rc = 0;
   }else{
@@ -436,6 +445,7 @@ static void decimalAddFunc(
 ){
   Decimal *pA = decimal_new(context, argv[0], 0, 0);
   Decimal *pB = decimal_new(context, argv[1], 0, 0);
+  UNUSED_PARAMETER(argc);
   decimal_add(pA, pB);
   decimal_result(context, pA);
   decimal_free(pA);
@@ -448,6 +458,7 @@ static void decimalSubFunc(
 ){
   Decimal *pA = decimal_new(context, argv[0], 0, 0);
   Decimal *pB = decimal_new(context, argv[1], 0, 0);
+  UNUSED_PARAMETER(argc);
   if( pB==0 ) return;
   pB->sign = !pB->sign;
   decimal_add(pA, pB);
@@ -468,6 +479,7 @@ static void decimalSumStep(
 ){
   Decimal *p;
   Decimal *pArg;
+  UNUSED_PARAMETER(argc);
   p = sqlite3_aggregate_context(context, sizeof(*p));
   if( p==0 ) return;
   if( !p->isInit ){
@@ -493,6 +505,7 @@ static void decimalSumInverse(
 ){
   Decimal *p;
   Decimal *pArg;
+  UNUSED_PARAMETER(argc);
   p = sqlite3_aggregate_context(context, sizeof(*p));
   if( p==0 ) return;
   if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
@@ -533,6 +546,7 @@ static void decimalMulFunc(
   signed char *acc = 0;
   int i, j, k;
   int minFrac;
+  UNUSED_PARAMETER(argc);
   if( pA==0 || pA->oom || pA->isNull
    || pB==0 || pB->oom || pB->isNull 
   ){
@@ -597,7 +611,7 @@ int sqlite3_decimal_init(
     { "decimal_sub",   2,   decimalSubFunc     },
     { "decimal_mul",   2,   decimalMulFunc     },
   };
-  int i;
+  unsigned int i;
   (void)pzErrMsg;  /* Unused parameter */
 
   for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){

diff --git a/ext/misc/ieee754.c b/ext/misc/ieee754.c
index cb274c3f7be6fce952bcee8ede08cf7ce4a173c2..121eb43d66fdaa4d5181551eb1f77d4ccc294b6f 100644 (file)
--- a/ext/misc/ieee754.c
+++ b/ext/misc/ieee754.c
@@ -90,6 +90,12 @@ SQLITE_EXTENSION_INIT1
 #include <assert.h>
 #include <string.h>
 
+/* Mark a function parameter as unused, to suppress nuisance compiler
+** warnings. */
+#ifndef UNUSED_PARAMETER
+# define UNUSED_PARAMETER(X)  (void)(X)
+#endif
+
 /*
 ** Implementation of the ieee754() function
 */
@@ -109,7 +115,7 @@ static void ieee754func(
      && sqlite3_value_bytes(argv[0])==sizeof(r)
     ){
       const unsigned char *x = sqlite3_value_blob(argv[0]);
-      int i;
+      unsigned int i;
       sqlite3_uint64 v = 0;
       for(i=0; i<sizeof(r); i++){
         v = (v<<8) | x[i];
@@ -201,12 +207,13 @@ static void ieee754func_from_blob(
   int argc,
   sqlite3_value **argv
 ){
+  UNUSED_PARAMETER(argc);
   if( sqlite3_value_type(argv[0])==SQLITE_BLOB
    && sqlite3_value_bytes(argv[0])==sizeof(double)
   ){
     double r;
     const unsigned char *x = sqlite3_value_blob(argv[0]);
-    int i;
+    unsigned int i;
     sqlite3_uint64 v = 0;
     for(i=0; i<sizeof(r); i++){
       v = (v<<8) | x[i];
@@ -220,13 +227,14 @@ static void ieee754func_to_blob(
   int argc,
   sqlite3_value **argv
 ){
+  UNUSED_PARAMETER(argc);
   if( sqlite3_value_type(argv[0])==SQLITE_FLOAT
    || sqlite3_value_type(argv[0])==SQLITE_INTEGER
   ){
     double r = sqlite3_value_double(argv[0]);
     sqlite3_uint64 v;
     unsigned char a[sizeof(r)];
-    int i;
+    unsigned int i;
     memcpy(&v, &r, sizeof(r));
     for(i=1; i<=sizeof(r); i++){
       a[sizeof(r)-i] = v&0xff;
@@ -259,7 +267,7 @@ int sqlite3_ieee_init(
     { "ieee754_from_blob", 1,   0, ieee754func_from_blob },
 
   };
-  int i;
+  unsigned int i;
   int rc = SQLITE_OK;
   SQLITE_EXTENSION_INIT2(pApi);
   (void)pzErrMsg;  /* Unused parameter */

diff --git a/manifest b/manifest
index 6013944b3383e85a75fdce474d1ac7f4285cce67..862ba559f55447d4e34f36293b1db05494dfe392 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 B 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b
-C Fix\sa\sharmless\scompiler\swarning.
-D 2020-07-18T18:03:26.362
+C More\sharmless\scompiler\swarning\sfixes.
+D 2020-07-18T18:44:59.284
 F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
 F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
 F autoconf/Makefile.am a8d1d24affe52ebf8d7ddcf91aa973fa0316618ab95bb68c87cabf8faf527dc8
@@ -12,10 +12,10 @@ F ext/fts3/fts3_write.c 723ed1b11ed46ad1b3a23c0d69fa39e77986783a82d5711bf87a5ce2
 F ext/fts5/fts5_index.c de14c9a30f45e2b847ff9284b14776d9d07961e545e8f1546a6aa3f915af721f
 F ext/fts5/test/fts5corrupt3.test 7afe0fea5b2160798fdc3306395048768c6fc13acefc0e7129d4075b6e1bb224
 F ext/lsm1/lsm_unix.c 11e0a5c19d754a4e1d93dfad06de8cc201f10f886b8e61a4c599ed34e334fc24
-F ext/misc/decimal.c c1897f624893d1c12e3c879d97ca7d1c4a36cae10d32afe632779de78c4aaa4f
-F ext/misc/ieee754.c bb6bd8e9eeeda5a7ac82839fcab5c0b8156b0532165387cc5458a97f60047b5d
+F ext/misc/decimal.c adeac2c22722ec19b8c1fb9d5c56f7a80747bbc0a5d54b4514abb6c76a34eaa3
+F ext/misc/ieee754.c 5c7ca326361c7368f95f5743972eade3b8b24f60359ed7cba4706668a5682896
 F main.mk b1cd0bc6aedad7ebb667b7f74f835f932f60ee33be2a5c3051fd93eb465f5c75
-F src/alter.c c63fb72ae0ca39175996fcf7008d44022a7ea99e03c0af3e1d968505ceff7120
+F src/alter.c 4bc16666a0df99d49658ec66f00ca36e541ec6cb39673ccc51be6a981fb9b2ce
 F src/attach.c 0b11e00c166b622c84ec176773b1d691c61ad07d247809e3e1635d4e99e71d30
 F src/btree.c b8b0e80c8bbe4e1fb35ae559e9e9aa009799c20cf12f159ebb503b05be1fab9b
 F src/btreeInt.h 19267385aa3bc00067d48e0e4ba83ae82dc08b0c15a3b3df20ea653cb462b5bf
@@ -24,7 +24,7 @@ F src/delete.c 410c771c25afc113c273d9efad6ab6881bda28c75a1838b9d2c52ba20d1dc704
 F src/expr.c 90039a043658ce78c3237ba5064c0934b7294120f6adc387f8d0fba306028154
 F src/malloc.c 22d5bdd9fe88ae4fad1b91a1b9735104b82853ffef868f1f05517d60dc1875f5
 F src/mem2.c b93b8762ab999a29ae7751532dadf0a1ac78040308a5fb1d17fcc365171d67eb
-F src/parse.y ecb9abdd79ec86c8dca7cb126bbdcf322c0e282f87a6d0d734ea5f2c57ced516
+F src/parse.y 5bdb760a29c0b25caf7e80e82210b81cd2ea3066d5199ca29e6eac40b34bc184
 F src/pragma.c ae499b5ab8f4e833f67e28bf2322500e9aa612aadf12581d1324333f848d8b51
 F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
 F src/resolve.c 2dd6821aac2cd27de9fcf6aa6d1f8c41b4b5841c9bc58bf1c9109008009a3a2e
@@ -34,7 +34,7 @@ F src/sqliteInt.h 9682c3ce6b970b3a997d65c140bdb5b286a04188e4e1c8489b64a525161ecb
 F src/test1.c fe56c4bcaa2685ca9aa25d817a0ee9345e189aff4a5a71a3d8ba946c7776feb8
 F src/test_malloc.c 21121ea85b49ec0bdb69995847cef9036ef9beca3ce63bbb776e4ea2ecc44b97
 F src/trigger.c ef67bde309a831515dc3c2173d792574309f2f42d45f8c078743fae9f7f98c75
-F src/update.c eca0479d84cc39034f155295134bb8fd5d3a99ed929ea28293c32263c29e5bfa
+F src/update.c fb15bec5b54fd098f4b84f6abc83c7103b45ba8484011fff8edf5ae31656eab6
 F src/util.c c0bacc165f46169d2b720c37c8719165e383211698fad1de39dd16a8c161815a
 F src/vdbe.c 981666c49d33039df6dc9fccd40191575586ac4866255b2f57819cc5eb99f572
 F src/vdbeapi.c c1a9004ac554d8d48794d2ce5f80397f8e419fd28643a543cc1e004c7713c3ef
@@ -69,7 +69,7 @@ F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfa
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/showlocks.c 9cc5e66d4ebbf2d194f39db2527ece92077e86ae627ddd233ee48e16e8142564
 F tool/speed-check.sh 615cbdf50f1409ef3bbf9f682e396df80f49d97ed93ed3e61c8e91fae6afde58
-P 88baf1eb0706503214012520be4d872594ccc5b4c9674c44cc07b67ade2bfcf2
-R a63b4fed56b568e9fdf61c79fa9390e0
+P 5a0b0c6e11146e200c3417903232e6932102b02d7bf128bac4b7cd74c257acd1
+R 5a9b588af23863437947680d0e2f2be1
 U drh
-Z 4c8dd3ce0ca1772ea4b1eb6fe57ed132
+Z ff1e0bb73d37ac11ce380a72047e91dc

diff --git a/manifest.uuid b/manifest.uuid
index 6b774a668f8ef7fa8e84b217cbdec55522924106..71be57ead5ad791553e853671f6d90d3965a11c7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5a0b0c6e11146e200c3417903232e6932102b02d7bf128bac4b7cd74c257acd1
\ No newline at end of file
+4c0d208c455abb983217a6dfea7634f677f8360fb57857e1421334fe7a5a23e2
\ No newline at end of file

diff --git a/src/alter.c b/src/alter.c
index 0ab7c38863ed59ae06b95d57a62a6be6291244f7..91c3b60dcd8f3a049dc764f5fea9ebe0b72f6fd1 100644 (file)
--- a/src/alter.c
+++ b/src/alter.c
@@ -1160,7 +1160,7 @@ static int renameEditSql(
 ** successful. Otherwise, return an SQLite error code and leave an error
 ** message in the Parse object.
 */
-static int renameResolveTrigger(Parse *pParse, const char *zDb){
+static int renameResolveTrigger(Parse *pParse){
   sqlite3 *db = pParse->db;
   Trigger *pNew = pParse->pNewTrigger;
   TriggerStep *pStep;
@@ -1422,7 +1422,7 @@ static void renameColumnFunc(
   }else{
     /* A trigger */
     TriggerStep *pStep;
-    rc = renameResolveTrigger(&sParse, (bTemp ? 0 : zDb));
+    rc = renameResolveTrigger(&sParse);
     if( rc!=SQLITE_OK ) goto renameColumnFunc_done;
 
     for(pStep=sParse.pNewTrigger->step_list; pStep; pStep=pStep->pNext){
@@ -1625,7 +1625,7 @@ static void renameTableFunc(
         }
 
         if( isLegacy==0 ){
-          rc = renameResolveTrigger(&sParse, bTemp ? 0 : zDb);
+          rc = renameResolveTrigger(&sParse);
           if( rc==SQLITE_OK ){
             renameWalkTrigger(&sWalker, pTrigger);
             for(pStep=pTrigger->step_list; pStep; pStep=pStep->pNext){
@@ -1712,7 +1712,7 @@ static void renameTableTest(
 
       else if( sParse.pNewTrigger ){
         if( isLegacy==0 ){
-          rc = renameResolveTrigger(&sParse, bTemp ? 0 : zDb);
+          rc = renameResolveTrigger(&sParse);
         }
         if( rc==SQLITE_OK ){
           int i1 = sqlite3SchemaToIndex(db, sParse.pNewTrigger->pTabSchema);

diff --git a/src/parse.y b/src/parse.y
index fb72d6549ac5138909690a7f304f3f552f289114..44e0b4f343ae9b86a90748d9b7ce505be9d86c24 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -469,7 +469,7 @@ cmd ::= DROP VIEW ifexists(E) fullname(X). {
 //////////////////////// The SELECT statement /////////////////////////////////
 //
 cmd ::= select(X).  {
-  SelectDest dest = {SRT_Output, 0, 0, 0, 0, 0};
+  SelectDest dest = {SRT_Output, 0, 0, 0, 0, 0, 0};
   sqlite3Select(pParse, X, &dest);
   sqlite3SelectDelete(pParse->db, X);
 }

diff --git a/src/update.c b/src/update.c
index b423eacb75b21999a9bb0782b496d363dd1a6dad..a9c43d62eb3e407426462e0536e0b94c0f19c006 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -187,8 +187,8 @@ static void updateFromSelect(
   ExprList *pChanges,             /* List of expressions to return */
   SrcList *pTabList,              /* List of tables to select from */
   Expr *pWhere,                   /* WHERE clause for query */
-  ExprList *pOrderBy,
-  Expr *pLimit
+  ExprList *pOrderBy,             /* ORDER BY clause */
+  Expr *pLimit                    /* LIMIT clause */
 ){
   int i;
   SelectDest dest;
@@ -210,6 +210,9 @@ static void updateFromSelect(
   }
   pOrderBy2 = sqlite3ExprListDup(db, pOrderBy, 0);
   pLimit2 = sqlite3ExprDup(db, pLimit, 0);
+#else
+  UNUSED_PARAMETER(pOrderBy);
+  UNUSED_PARAMETER(pLimit);
 #endif
 
   pSrc = sqlite3SrcListDup(db, pTabList, 0);
@@ -902,8 +905,8 @@ void sqlite3Update(
       j = aXRef[i];
       if( j>=0 ){
         if( nChangeFrom ){
-          assert( eOnePass==ONEPASS_OFF );
           int nOff = (isView ? pTab->nCol : nPk);
+          assert( eOnePass==ONEPASS_OFF );
           sqlite3VdbeAddOp3(v, OP_Column, iEph, nOff+j, k);
         }else{
           sqlite3ExprCode(pParse, pChanges->a[j].pExpr, k);
@@ -1165,7 +1168,7 @@ static void updateVirtualTable(
   int i;                    /* Loop counter */
   sqlite3 *db = pParse->db; /* Database connection */
   const char *pVTab = (const char*)sqlite3GetVTable(db, pTab);
-  WhereInfo *pWInfo;
+  WhereInfo *pWInfo = 0;
   int nArg = 2 + pTab->nCol;      /* Number of arguments to VUpdate */
   int regArg;                     /* First register in VUpdate arg array */
   int regRec;                     /* Register in which to assemble record */