Fix harmless compiler warnings.

FossilOrigin-Name: 8d5b76593d82b3a57bc904ced33c24cd49369868b5dd2fe7f2c7b114f5aee2f6

diff --git a/manifest b/manifest
index d8cdd7a1e9a3b97b42cb6f022a6a48d7c7c83c0e..9e7f070df81721599f9a8a9763c23805b943aae8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Implementation\sof\senhancement\srequest\s[695a1a53dea6b240]:\sThe\squery\splanner\nhas\simproved\sawareness\sof\swhen\sindexes\son\sexpressions\sare\scovering\sand\sadjusts\ntheir\scosts\saccordingly.
-D 2022-11-28T19:42:48.433
+C Fix\sharmless\scompiler\swarnings.
+D 2022-11-28T20:08:15.505
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -583,7 +583,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
-F src/btree.c d7d74e6c87a2d947bbf37c705a5ac11b0dc7b3848e76d0ff7c940bb644bba291
+F src/btree.c bd4375adcc5e45b3267549ba201a04b2f41fbb0a581d33513fb186a208d4c81d
 F src/btree.h 49da925329574798be3cbb745a49d069a9e67c99900d8a0d04b1e934d60394ea
 F src/btreeInt.h 88ad499c92b489afedbfefc3f067c4d15023ec021afe622db240dc9d2277cfa5
 F src/build.c d3e43e950e4e377c1d451a4862556792acdef1faba14a03f899d30d09731c48b
@@ -644,7 +644,7 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c c1eb8f3ee25152327f2e7e87db8cea549e57c104b63638bff4fc584d479c33f0
+F src/select.c 6983de0e6b8b68c97f82f9fca27ffb8f17161cff4d0d48fdf9eb40b213da0cc6
 F src/shell.c.in 9fda74d40b206a707aaa69fc5dc38e2c6a9137a3f4a1dcd7af581d59d92c063c
 F src/sqlite.h.in 3439711b72cf1a541716da3671ac40f8d5957cdecfc192d47d32f7aed94207c2
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2064,8 +2064,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6db0bc4bc0d272b610bef2aeeae43f539ed6e7cc0a9cc767d5af85ecb0019d5f c022c0152ad61a4f56e36f4062609073e2273fbf6f826c20652159be229c2d46
-R cf4309a5723ca7c0ed03679edb5024d5
+P e3474d79b27298e96e7686e5a6f9a8e736b8a6568a0a08fb1abe5bcca038ca63
+R a17c4713fb6c6661faa720f3ee28899c
 U drh
-Z 287040c8f243d0f300388e5a2dad7f24
+Z eb9319d9dfe7dee1c2083bff54e6e44f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index e27e9da559ba82c3e63171beeec0f85cc44f6163..3479de78d926182267ef97cfcb9b37e0b4776d6f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e3474d79b27298e96e7686e5a6f9a8e736b8a6568a0a08fb1abe5bcca038ca63
\ No newline at end of file
+8d5b76593d82b3a57bc904ced33c24cd49369868b5dd2fe7f2c7b114f5aee2f6
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index c949001b89579b275ec481a141f1a24bf111a10c..e71531c730eda39d6e33496904881e21f1d90487 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -7127,12 +7127,12 @@ static int insertCell(
     assert( get2byte(&data[pPage->hdrOffset+3])==pPage->nCell || CORRUPT_DB );
 #ifndef SQLITE_OMIT_AUTOVACUUM
     if( pPage->pBt->autoVacuum ){
-      int rc = SQLITE_OK;
+      int rc2 = SQLITE_OK;
       /* The cell may contain a pointer to an overflow page. If so, write
       ** the entry for the overflow page into the pointer map.
       */
-      ptrmapPutOvflPtr(pPage, pPage, pCell, &rc);
-      if( rc ) return rc;
+      ptrmapPutOvflPtr(pPage, pPage, pCell, &rc2);
+      if( rc2 ) return rc;
     }
 #endif
   }

diff --git a/src/select.c b/src/select.c
index 10498310d4166169a1117ad8bc9026950ce39ff8..0cd28b543e16ee8e4f9c3b1e4ce42053b2112424 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -6290,7 +6290,6 @@ static void printAggInfo(AggInfo *pAggInfo){
 ** (or recomputing) those aCol[] entries.
 */
 static void analyzeAggFuncArgs(
-  Parse *pParse,
   AggInfo *pAggInfo,
   NameContext *pNC
 ){
@@ -6335,7 +6334,7 @@ static void optimizeAggregateUseOfIndexedExpr(
         pAggInfo->aCol[pAggInfo->nColumn-1].iSorterColumn+1;
     }
   }
-  analyzeAggFuncArgs(pParse, pAggInfo, pNC);
+  analyzeAggFuncArgs(pAggInfo, pNC);
 #if TREETRACE_ENABLED
   if( sqlite3TreeTrace & 0x20 ){
     IndexedExpr *pIEpr;
@@ -6350,7 +6349,8 @@ static void optimizeAggregateUseOfIndexedExpr(
     printAggInfo(pAggInfo);
   }
 #else
-  (void)pSelect;  /* Suppress unused-parameter warnings */
+  UNUSED_PARAMETER(pSelect);
+  UNUSED_PARAMETER(pParse);
 #endif
 }
 
@@ -6360,6 +6360,7 @@ static void optimizeAggregateUseOfIndexedExpr(
 static int aggregateIdxEprRefToColCallback(Walker *pWalker, Expr *pExpr){
   AggInfo *pAggInfo;
   struct AggInfo_col *pCol;
+  UNUSED_PARAMETER(pWalker);
   if( pExpr->pAggInfo==0 ) return WRC_Continue;
   if( pExpr->op==TK_AGG_COLUMN ) return WRC_Continue;
   if( pExpr->op==TK_AGG_FUNCTION ) return WRC_Continue;
@@ -7611,7 +7612,7 @@ int sqlite3Select(
     }else{
       minMaxFlag = WHERE_ORDERBY_NORMAL;
     }
-    analyzeAggFuncArgs(pParse, pAggInfo, &sNC);
+    analyzeAggFuncArgs(pAggInfo, &sNC);
     if( db->mallocFailed ) goto select_end;
 #if TREETRACE_ENABLED
     if( sqlite3TreeTrace & 0x20 ){