mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some shadow variables in src/backend/replication/

Browse Source 
The code is able to compile already without warnings under
-Wshadow=compatible-local, which is itself already enabled in the tree,
and the ones fixed here showed up with the more restrictive -Wshadow.

There are more of these that we may want to look at, and the ones fixed
here made the code confusing.

Author: Peter Smith
Discussion: https://postgr.es/m/CAHut+PuR0y4ofNOxi691VTVWmBfScHV9AaBMGSpeh8+DKp81Nw@mail.gmail.com
This commit is contained in:
Michael Paquier 2023-08-31 08:07:48 +09:00
parent d0fe3046ee
commit b5934bfd60
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/replication/logical/logicalfuncs.c
View File

@ -181,10 +181,10 @@ pg_logical_slot_get_changes_guts(FunctionCallInfo fcinfo, bool confirm, bool bin
for (i = 0; i < nelems; i += 2) for (i = 0; i < nelems; i += 2)
{ {
char *name = TextDatumGetCString(datum_opts[i]); char *optname = TextDatumGetCString(datum_opts[i]);
char *opt = TextDatumGetCString(datum_opts[i + 1]); char *opt = TextDatumGetCString(datum_opts[i + 1]);
options = lappend(options, makeDefElem(name, (Node *) makeString(opt), -1)); options = lappend(options, makeDefElem(optname, (Node *) makeString(opt), -1));
} }
} }

6
src/backend/replication/logical/reorderbuffer.c
View File

@ -4840,16 +4840,16 @@ ReorderBufferToastReplace(ReorderBuffer *rb, ReorderBufferTXN *txn,
/* stitch toast tuple back together from its parts */ /* stitch toast tuple back together from its parts */
dlist_foreach(it, &ent->chunks) dlist_foreach(it, &ent->chunks)
{ {
bool isnull; bool cisnull;
ReorderBufferChange *cchange; ReorderBufferChange *cchange;
ReorderBufferTupleBuf *ctup; ReorderBufferTupleBuf *ctup;
Pointer chunk; Pointer chunk;
cchange = dlist_container(ReorderBufferChange, node, it.cur); cchange = dlist_container(ReorderBufferChange, node, it.cur);
ctup = cchange->data.tp.newtuple; ctup = cchange->data.tp.newtuple;
chunk = DatumGetPointer(fastgetattr(&ctup->tuple, 3, toast_desc, &isnull)); chunk = DatumGetPointer(fastgetattr(&ctup->tuple, 3, toast_desc, &cisnull));
Assert(!isnull); Assert(!cisnull);
Assert(!VARATT_IS_EXTERNAL(chunk)); Assert(!VARATT_IS_EXTERNAL(chunk));
Assert(!VARATT_IS_SHORT(chunk)); Assert(!VARATT_IS_SHORT(chunk));

8
src/backend/replication/walsender.c
View File

@ -3540,7 +3540,7 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS)
for (i = 0; i < max_wal_senders; i++) for (i = 0; i < max_wal_senders; i++)
{ {
WalSnd *walsnd = &WalSndCtl->walsnds[i]; WalSnd *walsnd = &WalSndCtl->walsnds[i];
XLogRecPtr sentPtr; XLogRecPtr sent_ptr;
XLogRecPtr write; XLogRecPtr write;
XLogRecPtr flush; XLogRecPtr flush;
XLogRecPtr apply; XLogRecPtr apply;
@ -3564,7 +3564,7 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS)
continue; continue;
} }
pid = walsnd->pid; pid = walsnd->pid;
sentPtr = walsnd->sentPtr; sent_ptr = walsnd->sentPtr;
state = walsnd->state; state = walsnd->state;
write = walsnd->write; write = walsnd->write;
flush = walsnd->flush; flush = walsnd->flush;
@ -3607,9 +3607,9 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS)
{ {
values[1] = CStringGetTextDatum(WalSndGetStateString(state)); values[1] = CStringGetTextDatum(WalSndGetStateString(state));
if (XLogRecPtrIsInvalid(sentPtr)) if (XLogRecPtrIsInvalid(sent_ptr))
nulls[2] = true; nulls[2] = true;
values[2] = LSNGetDatum(sentPtr); values[2] = LSNGetDatum(sent_ptr);
if (XLogRecPtrIsInvalid(write)) if (XLogRecPtrIsInvalid(write))
nulls[3] = true; nulls[3] = true;