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

diff --git a/contrib/hstore/crc32.c b/contrib/hstore/crc32.c
index c82fc664723d875c4cf3bf7bda050fa3a9fa27a3..6af0c1795a5786a67c3a442a2481d110d7e41cdc 100644 (file)
--- 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 ea1a661fefbbceaab5f3bf503a8ab68aab2dfeaa..9c62216dd7340bdadaa4498882c7235756b6f2b0 100644 (file)
--- 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/transam/xlog.c b/src/backend/access/transam/xlog.c
index 8e54663d761daa1b2bfb824f3b4b05b36ec5a81d..9b3ed550ed903d57c8cae2b170e8b639b39a8e63 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -2159,7 +2159,9 @@ AdvanceXLInsertBuffer(XLogRecPtr upto, bool opportunistic)
    XLogRecPtr  NewPageEndPtr = InvalidXLogRecPtr;
    XLogRecPtr  NewPageBeginPtr;
    XLogPageHeader NewPage;
+#ifdef WAL_DEBUG
    int         npages = 0;
+#endif
 
    LWLockAcquire(WALBufMappingLock, LW_EXCLUSIVE);
 
@@ -2306,7 +2308,9 @@ AdvanceXLInsertBuffer(XLogRecPtr upto, bool opportunistic)
 
        XLogCtl->InitializedUpTo = NewPageEndPtr;
 
+#ifdef WAL_DEBUG
        npages++;
+#endif
    }
    LWLockRelease(WALBufMappingLock);
 

diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index d4f46b8d4614999c163bec31fb2e78ae5377dcca..55e57fa0648e418bbb3e482c1aba96b95ebbd3a2 100644 (file)
--- 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 b1846e31e3767621c240ea58ebb54234966eb5ce..e15eb4c490ce6ac164eed93d3dbbc592c563e88e 100644 (file)
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -690,6 +690,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 4d7e9c311fb610ce36a87531c3dbe8dc03c297d3..d59b2652c01cf3654ccad4062920f1d8be0f0218 100644 (file)
--- 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 fd26ea3f08b6c9914b28179de94b436c1a7de44f..65af9c614ff38750b9656f9d3efac57833a4fb98 100644 (file)
--- 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();