diff options
| author | Michael Paquier <michael@paquier.xyz> | 2023-08-31 08:07:48 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2023-08-31 08:07:48 +0900 |
| commit | b5934bfd6071fed3a38cea0cfaa93afda63d9c0c (patch) | |
| tree | 8a51a96f61699f0318315ccc89cef39f6866f2b5 | |
| parent | d0fe3046eec3913829ccd5010849b25acd25fce4 (diff) | |
| download | postgresql-b5934bfd6071fed3a38cea0cfaa93afda63d9c0c.tar.gz postgresql-b5934bfd6071fed3a38cea0cfaa93afda63d9c0c.zip | |
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
| -rw-r--r-- | src/backend/replication/logical/logicalfuncs.c | 4 | ||||
| -rw-r--r-- | src/backend/replication/logical/reorderbuffer.c | 6 | ||||
| -rw-r--r-- | src/backend/replication/walsender.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c index 55a24c02c94..197169d6b0d 100644 --- a/src/backend/replication/logical/logicalfuncs.c +++ b/src/backend/replication/logical/logicalfuncs.c @@ -181,10 +181,10 @@ pg_logical_slot_get_changes_guts(FunctionCallInfo fcinfo, bool confirm, bool bin 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]); - options = lappend(options, makeDefElem(name, (Node *) makeString(opt), -1)); + options = lappend(options, makeDefElem(optname, (Node *) makeString(opt), -1)); } } diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index 0dab0bb64e8..12edc5772a9 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -4840,16 +4840,16 @@ ReorderBufferToastReplace(ReorderBuffer *rb, ReorderBufferTXN *txn, /* stitch toast tuple back together from its parts */ dlist_foreach(it, &ent->chunks) { - bool isnull; + bool cisnull; ReorderBufferChange *cchange; ReorderBufferTupleBuf *ctup; Pointer chunk; cchange = dlist_container(ReorderBufferChange, node, it.cur); 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_SHORT(chunk)); diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 80374c55be5..46e48492ac8 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -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; |