From e36e936e0ee664e07588732d1a8d105c5ec8e57d Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 3 Sep 2020 22:57:35 -0400 Subject: [PATCH] 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 --- src/backend/access/gist/gistxlog.c | 1 - src/backend/catalog/heap.c | 2 +- src/backend/storage/smgr/md.c | 6 ++++-- src/backend/utils/adt/json.c | 2 +- src/backend/utils/mmgr/mcxt.c | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index dcd28f678b..91b3e11182 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 abd5bdb866..c151ad829d 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 0eacd461cd..1d4aa482cc 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 a7a91b72f6..420d3cdcbb 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 88c76f290c..dda70ef9f3 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;