diff options
author | Tom Lane | 2022-09-21 17:52:38 +0000 |
---|---|---|
committer | Tom Lane | 2022-09-21 17:52:38 +0000 |
commit | db8e36682d9508b7cf4eb1c69522fe7f4f805086 (patch) | |
tree | 9d02666e4c6cbbac16ff799aeb15de1ca0751ee3 | |
parent | 43f72e0f73a52f09651a96529970fd8ea75186a9 (diff) |
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.c | 3 | ||||
-rw-r--r-- | src/backend/utils/cache/relcache.c | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c index 42d10388ae7..109a0d978fd 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 54de0721815..c37e43a9044 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -4373,7 +4373,6 @@ AttrDefaultFetch(Relation relation) HeapTuple htup; Datum val; bool isnull; - int found; int i; ScanKeyInit(&skey, @@ -4384,7 +4383,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))) { @@ -4399,8 +4397,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, |