]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Suppress more variable-set-but-not-used warnings from clang 15.
authorTom Lane <tgl@sss.pgh.pa.us>
Wed, 21 Sep 2022 17:52:38 +0000 (13:52 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Wed, 21 Sep 2022 17:52:38 +0000 (13:52 -0400)
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

src/backend/optimizer/util/var.c
src/backend/utils/adt/varlena.c
src/backend/utils/cache/relcache.c

index 1e71f322a37bf76f690103d239ba3188fb8d5c2f..d5f8e879d873f5fc186b80c03d0d5c6b0b302d43 100644 (file)
@@ -699,16 +699,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;
index a2633ce640adba79bcc6698161094f8d2096cbbf..0c128ae15c18ede0966acb69709f6ea23b78b29d 100644 (file)
@@ -4370,7 +4370,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;
@@ -4421,7 +4420,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();
 
index 0524cb8541fe44847dcabf7041f66bedb4bb68e4..840f1c85347779b21a78344155a40c2f77c82bc6 100644 (file)
@@ -4096,7 +4096,6 @@ AttrDefaultFetch(Relation relation)
        HeapTuple       htup;
        Datum           val;
        bool            isnull;
-       int                     found;
        int                     i;
 
        ScanKeyInit(&skey,
@@ -4107,7 +4106,6 @@ AttrDefaultFetch(Relation relation)
        adrel = heap_open(AttrDefaultRelationId, AccessShareLock);
        adscan = systable_beginscan(adrel, AttrDefaultIndexId, true,
                                                                NULL, 1, &skey);
-       found = 0;
 
        while (HeapTupleIsValid(htup = systable_getnext(adscan)))
        {
@@ -4122,8 +4120,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,