postgres.git / summary / log / commit / refs
commit bf216123446c4aa81998f51e54e55ae706ff175e
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed Sep 21 17:52:38 2022 +0000
First released in: 10.23, 11.18, 12.13, 13.9, 14.6
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
contrib/hstore/crc32.c | 6 ++----
contrib/ltree/crc32.c | 6 ++----
src/backend/access/gin/gindatapage.c | 3 ---
src/backend/optimizer/util/var.c | 3 ---
src/backend/parser/gram.y | 1 +
src/backend/utils/adt/array_typanalyze.c | 4 +---
src/backend/utils/adt/varlena.c | 3 +--
7 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/contrib/hstore/crc32.c b/contrib/hstore/crc32.c
index c82fc664723..6af0c1795a5 100644
--- a/contrib/hstore/crc32.c
+++ b/contrib/hstore/crc32.c
@@ -95,12 +95,10 @@ crc32_sz(char *buf, int size)
{
unsigned int crc = ~((unsigned int) 0);
char *p;
- int len,
- nr;
+ int nr;
- len = 0;
nr = size;
- for (len += nr, p = buf; nr--; ++p)
+ for (p = buf; nr--; ++p)
_CRC32_(crc, *p);
return ~crc;
}
diff --git a/contrib/ltree/crc32.c b/contrib/ltree/crc32.c
index ea1a661fefb..9c62216dd73 100644
--- a/contrib/ltree/crc32.c
+++ b/contrib/ltree/crc32.c
@@ -103,12 +103,10 @@ ltree_crc32_sz(char *buf, int size)
{
unsigned int crc = ~((unsigned int) 0);
char *p;
- int len,
- nr;
+ int nr;
- len = 0;
nr = size;
- for (len += nr, p = buf; nr--; ++p)
+ for (p = buf; nr--; ++p)
_CRC32_(crc, TOLOWER((unsigned int) *p));
return ~crc;
}
diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c
index 27faef5124c..9aca2d3d4f0 100644
--- a/src/backend/access/gin/gindatapage.c
+++ b/src/backend/access/gin/gindatapage.c
@@ -465,7 +465,6 @@ dataSplitPage(GinBtree btree, Buffer lbuf, Buffer rbuf, OffsetNumber off, XLogRe
Page rpage = BufferGetPage(rbuf);
Size pageSize = PageGetPageSize(lpage);
Size freeSpace;
- uint32 nCopied = 1;
/* these must be static so they can be returned to caller */
static ginxlogSplit data;
@@ -485,7 +484,6 @@ dataSplitPage(GinBtree btree, Buffer lbuf, Buffer rbuf, OffsetNumber off, XLogRe
if (GinPageIsLeaf(lpage) && GinPageRightMost(lpage) && off > GinPageGetOpaque(lpage)->maxoff)
{
- nCopied = 0;
while (btree->curitem < btree->nitem &&
maxoff * sizeof(ItemPointerData) < 2 * (freeSpace - sizeof(ItemPointerData)))
{
@@ -493,7 +491,6 @@ dataSplitPage(GinBtree btree, Buffer lbuf, Buffer rbuf, OffsetNumber off, XLogRe
btree->items + btree->curitem,
sizeof(ItemPointerData));
maxoff++;
- nCopied++;
btree->curitem++;
}
}
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index 5cfefd34519..081ce9b93ad 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -651,16 +651,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/parser/gram.y b/src/backend/parser/gram.y
index 1a3810667bb..8981525426b 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -678,6 +678,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
stmtblock: stmtmulti
{
pg_yyget_extra(yyscanner)->parsetree = $1;
+ (void) yynerrs; /* suppress compiler warning */
}
;
diff --git a/src/backend/utils/adt/array_typanalyze.c b/src/backend/utils/adt/array_typanalyze.c
index 6b7cd9791da..5054f0c194e 100644
--- a/src/backend/utils/adt/array_typanalyze.c
+++ b/src/backend/utils/adt/array_typanalyze.c
@@ -216,7 +216,6 @@ compute_array_stats(VacAttrStats *stats, AnalyzeAttrFetchFunc fetchfunc,
{
ArrayAnalyzeExtraData *extra_data;
int num_mcelem;
- int null_cnt = 0;
int null_elem_cnt = 0;
int analyzed_rows = 0;
@@ -321,8 +320,7 @@ compute_array_stats(VacAttrStats *stats, AnalyzeAttrFetchFunc fetchfunc,
value = fetchfunc(stats, array_no, &isnull);
if (isnull)
{
- /* array is null, just count that */
- null_cnt++;
+ /* ignore arrays that are null overall */
continue;
}
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index f25a6579e4c..70d8b9f4729 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -3403,7 +3403,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;
@@ -3443,7 +3442,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();
[parent: 8c8ee5c99144]