aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2022-09-21 13:52:38 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2022-09-21 13:52:38 -0400
commit9a2267bcfc7d37097a04888813f07dc5460e9a75 (patch)
tree29fb874acc9d5b64b46330cd2f9e98c1d274b5f4
parent52a5fd5b9f8f91fb1df6c7258e1ff58739a61db8 (diff)
downloadpostgresql-9a2267bcfc7d37097a04888813f07dc5460e9a75.tar.gz
postgresql-9a2267bcfc7d37097a04888813f07dc5460e9a75.zip
Suppress more variable-set-but-not-used warnings from clang 15.
Mop up assorted set-but-not-used warnings in the back branches. This includes back-patching relevant fixes from commit 152c9f7b8 the rest of the way, but there are also several cases that did not appear in HEAD. Some of those we'd fixed in a retail way but not back-patched, and others I think just got rewritten out of existence during nearby refactoring. While here, also back-patch b1980f6d0 (PL/Tcl: Fix compiler warnings with Tcl 8.6) into 9.2, so that that branch compiles warning-free with modern Tcl. Per project policy, this is a candidate for back-patching into out-of-support branches: it suppresses annoying compiler warnings but changes no behavior. Hence, back-patch all the way to 9.2. Discussion: https://postgr.es/m/514615.1663615243@sss.pgh.pa.us
-rw-r--r--src/backend/optimizer/util/var.c3
-rw-r--r--src/backend/utils/cache/relcache.c4
2 files changed, 0 insertions, 7 deletions
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index 1892ae93211..0a4f32e0c38 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -773,16 +773,13 @@ flatten_join_alias_vars_mutator(Node *node,
RowExpr *rowexpr;
List *fields = NIL;
List *colnames = NIL;
- AttrNumber attnum;
ListCell *lv;
ListCell *ln;
- attnum = 0;
Assert(list_length(rte->joinaliasvars) == list_length(rte->eref->colnames));
forboth(lv, rte->joinaliasvars, ln, rte->eref->colnames)
{
newvar = (Node *) lfirst(lv);
- attnum++;
/* Ignore dropped columns */
if (newvar == NULL)
continue;
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index bad672f51b3..4b747550ca0 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -4206,7 +4206,6 @@ AttrDefaultFetch(Relation relation)
HeapTuple htup;
Datum val;
bool isnull;
- int found;
int i;
ScanKeyInit(&skey,
@@ -4217,7 +4216,6 @@ AttrDefaultFetch(Relation relation)
adrel = table_open(AttrDefaultRelationId, AccessShareLock);
adscan = systable_beginscan(adrel, AttrDefaultIndexId, true,
NULL, 1, &skey);
- found = 0;
while (HeapTupleIsValid(htup = systable_getnext(adscan)))
{
@@ -4232,8 +4230,6 @@ AttrDefaultFetch(Relation relation)
elog(WARNING, "multiple attrdef records found for attr %s of rel %s",
NameStr(attr->attname),
RelationGetRelationName(relation));
- else
- found++;
val = fastgetattr(htup,
Anum_pg_attrdef_adbin,