aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2020-09-03 22:57:35 -0400
committerBruce Momjian <bruce@momjian.us>2020-09-03 22:57:35 -0400
commite36e936e0ee664e07588732d1a8d105c5ec8e57d (patch)
treeb553ea0e8f269a578533657524d0d516a91c708f /src
parent844c05abc3f1c1703bf17cf44ab66351ed9711d2 (diff)
downloadpostgresql-e36e936e0ee664e07588732d1a8d105c5ec8e57d.tar.gz
postgresql-e36e936e0ee664e07588732d1a8d105c5ec8e57d.zip
remove redundant initializations
Reported-by: Ranier Vilela Discussion: https://postgr.es/m/CAEudQAo1+AcGppxDSg8k+zF4+Kv+eJyqzEDdbpDg58-=MQcerQ@mail.gmail.com Author: Ranier Vilela Backpatch-through: master
Diffstat (limited to 'src')
-rw-r--r--src/backend/access/gist/gistxlog.c1
-rw-r--r--src/backend/catalog/heap.c2
-rw-r--r--src/backend/storage/smgr/md.c6
-rw-r--r--src/backend/utils/adt/json.c2
-rw-r--r--src/backend/utils/mmgr/mcxt.c2
5 files changed, 7 insertions, 6 deletions
diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c
index dcd28f678b3..91b3e111820 100644
--- a/src/backend/access/gist/gistxlog.c
+++ b/src/backend/access/gist/gistxlog.c
@@ -405,7 +405,6 @@ gistRedoPageReuse(XLogReaderState *record)
* logged value is very old, so that XID wrap-around already happened
* on it, there can't be any snapshots that still see it.
*/
- nextXid = ReadNextFullTransactionId();
diff = U64FromFullTransactionId(nextXid) -
U64FromFullTransactionId(latestRemovedFullXid);
if (diff < MaxTransactionId / 2)
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index abd5bdb866b..c151ad829d4 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -3436,7 +3436,7 @@ List *
heap_truncate_find_FKs(List *relationIds)
{
List *result = NIL;
- List *oids = list_copy(relationIds);
+ List *oids;
List *parent_cons;
ListCell *cell;
ScanKeyData key;
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 0eacd461cd3..1d4aa482ccd 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -734,9 +734,11 @@ mdwrite(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
BlockNumber
mdnblocks(SMgrRelation reln, ForkNumber forknum)
{
- MdfdVec *v = mdopenfork(reln, forknum, EXTENSION_FAIL);
+ MdfdVec *v;
BlockNumber nblocks;
- BlockNumber segno = 0;
+ BlockNumber segno;
+
+ mdopenfork(reln, forknum, EXTENSION_FAIL);
/* mdopen has opened the first segment */
Assert(reln->md_num_open_segs[forknum] > 0);
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index a7a91b72f69..420d3cdcbb9 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -990,7 +990,7 @@ catenate_stringinfo_string(StringInfo buffer, const char *addon)
Datum
json_build_object(PG_FUNCTION_ARGS)
{
- int nargs = PG_NARGS();
+ int nargs;
int i;
const char *sep = "";
StringInfo result;
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 88c76f290ce..dda70ef9f33 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -476,7 +476,7 @@ MemoryContextMemAllocated(MemoryContext context, bool recurse)
if (recurse)
{
- MemoryContext child = context->firstchild;
+ MemoryContext child;
for (child = context->firstchild;
child != NULL;