Skip to content

Commit c705646

Browse files
committed
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 152c9f7 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 b1980f6 (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
1 parent ca8fd34 commit c705646

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

src/backend/optimizer/util/var.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,16 +705,13 @@ flatten_join_alias_vars_mutator(Node *node,
705705
RowExpr *rowexpr;
706706
List *fields = NIL;
707707
List *colnames = NIL;
708-
AttrNumber attnum;
709708
ListCell *lv;
710709
ListCell *ln;
711710

712-
attnum = 0;
713711
Assert(list_length(rte->joinaliasvars) == list_length(rte->eref->colnames));
714712
forboth(lv, rte->joinaliasvars, ln, rte->eref->colnames)
715713
{
716714
newvar = (Node *) lfirst(lv);
717-
attnum++;
718715
/* Ignore dropped columns */
719716
if (newvar == NULL)
720717
continue;

src/backend/utils/adt/varlena.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4192,7 +4192,6 @@ text_to_array_internal(PG_FUNCTION_ARGS)
41924192
* to search for occurrences of fldsep.
41934193
*/
41944194
TextPositionState state;
4195-
int fldnum;
41964195
int start_posn;
41974196
int end_posn;
41984197
int chunk_len;
@@ -4232,7 +4231,7 @@ text_to_array_internal(PG_FUNCTION_ARGS)
42324231
/* start_ptr points to the start_posn'th character of inputstring */
42334232
start_ptr = VARDATA_ANY(inputstring);
42344233

4235-
for (fldnum = 1;; fldnum++) /* field number is 1 based */
4234+
for (;;)
42364235
{
42374236
CHECK_FOR_INTERRUPTS();
42384237

0 commit comments

Comments
 (0)