diff options
author | Tom Lane | 2022-09-21 17:52:38 +0000 |
---|---|---|
committer | Tom Lane | 2022-09-21 17:52:38 +0000 |
commit | c705646b751e08d584f6eeb098f1ed002aa7b11c (patch) | |
tree | f99c9826857ad3a80c713e753b85e516e4b3eea7 | |
parent | ca8fd341e165e1b3f99deb07889aa58db7f8a898 (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/[email protected]
-rw-r--r-- | src/backend/optimizer/util/var.c | 3 | ||||
-rw-r--r-- | src/backend/utils/adt/varlena.c | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c index 292e1f4aac3..72bd6cdbd07 100644 --- a/src/backend/optimizer/util/var.c +++ b/src/backend/optimizer/util/var.c @@ -705,16 +705,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/adt/varlena.c b/src/backend/utils/adt/varlena.c index 93a3ba11dc0..77bb0a896be 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -4192,7 +4192,6 @@ text_to_array_internal(PG_FUNCTION_ARGS) * to search for occurrences of fldsep. */ TextPositionState state; - int fldnum; int start_posn; int end_posn; int chunk_len; @@ -4232,7 +4231,7 @@ text_to_array_internal(PG_FUNCTION_ARGS) /* start_ptr points to the start_posn'th character of inputstring */ start_ptr = VARDATA_ANY(inputstring); - for (fldnum = 1;; fldnum++) /* field number is 1 based */ + for (;;) { CHECK_FOR_INTERRUPTS(); |