mirror of
https://github.com/postgres/postgres.git
synced 2025-07-26 01:22:12 +03:00
Fix some shadow variables in src/backend/replication/
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:
@ -3540,7 +3540,7 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS)
|
||||
for (i = 0; i < max_wal_senders; i++)
|
||||
{
|
||||
WalSnd *walsnd = &WalSndCtl->walsnds[i];
|
||||
XLogRecPtr sentPtr;
|
||||
XLogRecPtr sent_ptr;
|
||||
XLogRecPtr write;
|
||||
XLogRecPtr flush;
|
||||
XLogRecPtr apply;
|
||||
@ -3564,7 +3564,7 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS)
|
||||
continue;
|
||||
}
|
||||
pid = walsnd->pid;
|
||||
sentPtr = walsnd->sentPtr;
|
||||
sent_ptr = walsnd->sentPtr;
|
||||
state = walsnd->state;
|
||||
write = walsnd->write;
|
||||
flush = walsnd->flush;
|
||||
@ -3607,9 +3607,9 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS)
|
||||
{
|
||||
values[1] = CStringGetTextDatum(WalSndGetStateString(state));
|
||||
|
||||
if (XLogRecPtrIsInvalid(sentPtr))
|
||||
if (XLogRecPtrIsInvalid(sent_ptr))
|
||||
nulls[2] = true;
|
||||
values[2] = LSNGetDatum(sentPtr);
|
||||
values[2] = LSNGetDatum(sent_ptr);
|
||||
|
||||
if (XLogRecPtrIsInvalid(write))
|
||||
nulls[3] = true;
|
||||
|
Reference in New Issue
Block a user