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 commit152c9f7b8
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-patchb1980f6d0
(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
This commit is contained in:
parent
5d3ce0d823
commit
850cb88e4b
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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++;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -784,16 +784,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;
|
||||
|
|
|
@ -653,6 +653,7 @@ static void processCASbits(int cas_bits, int location, const char *constrType,
|
|||
stmtblock: stmtmulti
|
||||
{
|
||||
pg_yyget_extra(yyscanner)->parsetree = $1;
|
||||
(void) yynerrs; /* suppress compiler warning */
|
||||
}
|
||||
;
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -3169,7 +3169,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;
|
||||
|
@ -3209,7 +3208,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();
|
||||
|
||||
|
|
|
@ -18,6 +18,11 @@
|
|||
#define CONST84
|
||||
#endif
|
||||
|
||||
/* ... and for Tcl 8.6. */
|
||||
#ifndef CONST86
|
||||
#define CONST86
|
||||
#endif
|
||||
|
||||
#include "access/xact.h"
|
||||
#include "catalog/pg_proc.h"
|
||||
#include "catalog/pg_type.h"
|
||||
|
@ -258,7 +263,7 @@ pltcl_FinalizeNotifier(ClientData clientData)
|
|||
}
|
||||
|
||||
static void
|
||||
pltcl_SetTimer(Tcl_Time *timePtr)
|
||||
pltcl_SetTimer(CONST86 Tcl_Time *timePtr)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -284,7 +289,7 @@ pltcl_ServiceModeHook(int mode)
|
|||
}
|
||||
|
||||
static int
|
||||
pltcl_WaitForEvent(Tcl_Time *timePtr)
|
||||
pltcl_WaitForEvent(CONST86 Tcl_Time *timePtr)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue