Avoid shadowing a variable in sync.c.

macdice · macdice · commit 579449105857 · 2022-07-15T00:06:32.000+12:00
It was confusing to reuse the variable name 'entry' in two scopes. Use distinct variable names. Reported-by: Ranier Vilela <ranier.vf@gmail.com> Reported-by: Tom Lane <tgl@sss.pgh.pa.us> Reported-by: Kyotaro Horiguchi <horikyota.ntt@gmail.com> Discussion: https://postgr.es/m/CAEudQArDrFyQ15Am3rgWBunGBVZFDb90onTS8SRiFAWHeiLiFA%40mail.gmail.com
diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c
@@ -510,26 +510,26 @@ RememberSyncRequest(const FileTag *ftag, SyncRequestType type)
 	else if (type == SYNC_FILTER_REQUEST)
 	{
 		HASH_SEQ_STATUS hstat;
-		PendingFsyncEntry *entry;
+		PendingFsyncEntry *pfe;
 		ListCell   *cell;
 
 		/* Cancel matching fsync requests */
 		hash_seq_init(&hstat, pendingOps);
-		while ((entry = (PendingFsyncEntry *) hash_seq_search(&hstat)) != NULL)
+		while ((pfe = (PendingFsyncEntry *) hash_seq_search(&hstat)) != NULL)
 		{
-			if (entry->tag.handler == ftag->handler &&
-				syncsw[ftag->handler].sync_filetagmatches(ftag, &entry->tag))
-				entry->canceled = true;
+			if (pfe->tag.handler == ftag->handler &&
+				syncsw[ftag->handler].sync_filetagmatches(ftag, &pfe->tag))
+				pfe->canceled = true;
 		}
 
 		/* Cancel matching unlink requests */
 		foreach(cell, pendingUnlinks)
 		{
-			PendingUnlinkEntry *entry = (PendingUnlinkEntry *) lfirst(cell);
+			PendingUnlinkEntry *pue = (PendingUnlinkEntry *) lfirst(cell);
 
-			if (entry->tag.handler == ftag->handler &&
-				syncsw[ftag->handler].sync_filetagmatches(ftag, &entry->tag))
-				entry->canceled = true;
+			if (pue->tag.handler == ftag->handler &&
+				syncsw[ftag->handler].sync_filetagmatches(ftag, &pue->tag))
+				pue->canceled = true;
 		}
 	}
 	else if (type == SYNC_UNLINK_REQUEST)

Original file line number	Diff line number	Diff line change
`@@ -510,26 +510,26 @@ RememberSyncRequest(const FileTag *ftag, SyncRequestType type)`
`510`	`510`	`else if (type == SYNC_FILTER_REQUEST)`
`511`	`511`	`{`
`512`	`512`	`HASH_SEQ_STATUS hstat;`
`513`		`- PendingFsyncEntry *entry;`
	`513`	`+ PendingFsyncEntry *pfe;`
`514`	`514`	`ListCell *cell;`
`515`	`515`
`516`	`516`	`/* Cancel matching fsync requests */`
`517`	`517`	`hash_seq_init(&hstat, pendingOps);`
`518`		`- while ((entry = (PendingFsyncEntry *) hash_seq_search(&hstat)) != NULL)`
	`518`	`+ while ((pfe = (PendingFsyncEntry *) hash_seq_search(&hstat)) != NULL)`
`519`	`519`	`{`
`520`		`- if (entry->tag.handler == ftag->handler &&`
`521`		`- syncsw[ftag->handler].sync_filetagmatches(ftag, &entry->tag))`
`522`		`- entry->canceled = true;`
	`520`	`+ if (pfe->tag.handler == ftag->handler &&`
	`521`	`+ syncsw[ftag->handler].sync_filetagmatches(ftag, &pfe->tag))`
	`522`	`+ pfe->canceled = true;`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`/* Cancel matching unlink requests */`
`526`	`526`	`foreach(cell, pendingUnlinks)`
`527`	`527`	`{`
`528`		`- PendingUnlinkEntry entry = (PendingUnlinkEntry ) lfirst(cell);`
	`528`	`+ PendingUnlinkEntry pue = (PendingUnlinkEntry ) lfirst(cell);`
`529`	`529`
`530`		`- if (entry->tag.handler == ftag->handler &&`
`531`		`- syncsw[ftag->handler].sync_filetagmatches(ftag, &entry->tag))`
`532`		`- entry->canceled = true;`
	`530`	`+ if (pue->tag.handler == ftag->handler &&`
	`531`	`+ syncsw[ftag->handler].sync_filetagmatches(ftag, &pue->tag))`
	`532`	`+ pue->canceled = true;`
`533`	`533`	`}`
`534`	`534`	`}`
`535`	`535`	`else if (type == SYNC_UNLINK_REQUEST)`