remove redundant initializations

bmomjian · bmomjian · commit e36e936e0ee6 · 2020-09-03T22:57:35.000-04:00
Reported-by: Ranier Vilela Discussion: https://postgr.es/m/CAEudQAo1+AcGppxDSg8k+zF4+Kv+eJyqzEDdbpDg58-=MQcerQ@mail.gmail.com Author: Ranier Vilela Backpatch-through: master
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -476,7 +476,7 @@ MemoryContextMemAllocated(MemoryContext context, bool recurse)
 
 	if (recurse)
 	{
-		MemoryContext child = context->firstchild;
+		MemoryContext child;
 
 		for (child = context->firstchild;
 			 child != NULL;

Original file line number	Diff line number	Diff line change
`@@ -3436,7 +3436,7 @@ List *`
`3436`	`3436`	`heap_truncate_find_FKs(List *relationIds)`
`3437`	`3437`	`{`
`3438`	`3438`	`List *result = NIL;`
`3439`		`- List *oids = list_copy(relationIds);`
	`3439`	`+ List *oids;`
`3440`	`3440`	`List *parent_cons;`
`3441`	`3441`	`ListCell *cell;`
`3442`	`3442`	`ScanKeyData key;`
Original file line number	Diff line number	Diff line change
`@@ -990,7 +990,7 @@ catenate_stringinfo_string(StringInfo buffer, const char *addon)`
`990`	`990`	`Datum`
`991`	`991`	`json_build_object(PG_FUNCTION_ARGS)`
`992`	`992`	`{`
`993`		`- int nargs = PG_NARGS();`
	`993`	`+ int nargs;`
`994`	`994`	`int i;`
`995`	`995`	`const char *sep = "";`
`996`	`996`	`StringInfo result;`
Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ MemoryContextMemAllocated(MemoryContext context, bool recurse)`
`476`	`476`
`477`	`477`	`if (recurse)`
`478`	`478`	`{`
`479`		`- MemoryContext child = context->firstchild;`
	`479`	`+ MemoryContext child;`
`480`	`480`
`481`	`481`	`for (child = context->firstchild;`
`482`	`482`	`child != NULL;`