Commit5794491

committed

Avoid shadowing a variable in sync.c.

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

1 parent7bae3bb commit5794491Copy full SHA for 5794491

File tree

-9

lines changed

-9

lines changed

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -510,26 +510,26 @@ RememberSyncRequest(const FileTag *ftag, SyncRequestType type)`
`510`	`510`	`elseif (type==SYNC_FILTER_REQUEST)`
`511`	`511`	`{`
`512`	`512`	`HASH_SEQ_STATUShstat;`
`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`		`-PendingUnlinkEntryentry= (PendingUnlinkEntry)lfirst(cell);`
	`528`	`+PendingUnlinkEntrypue= (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`	`elseif (type==SYNC_UNLINK_REQUEST)`

Comments

(0)