Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5794491

Browse files
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 parent 7bae3bb commit 5794491

File tree

1 file changed

+9
-9
lines changed
  • src/backend/storage/sync

1 file changed

+9
-9
lines changed

src/backend/storage/sync/sync.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -510,26 +510,26 @@ RememberSyncRequest(const FileTag *ftag, SyncRequestType type)
510510
else if (type == SYNC_FILTER_REQUEST)
511511
{
512512
HASH_SEQ_STATUS hstat;
513-
PendingFsyncEntry *entry;
513+
PendingFsyncEntry *pfe;
514514
ListCell *cell;
515515

516516
/* Cancel matching fsync requests */
517517
hash_seq_init(&hstat, pendingOps);
518-
while ((entry = (PendingFsyncEntry *) hash_seq_search(&hstat)) != NULL)
518+
while ((pfe = (PendingFsyncEntry *) hash_seq_search(&hstat)) != NULL)
519519
{
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;
523523
}
524524

525525
/* Cancel matching unlink requests */
526526
foreach(cell, pendingUnlinks)
527527
{
528-
PendingUnlinkEntry *entry = (PendingUnlinkEntry *) lfirst(cell);
528+
PendingUnlinkEntry *pue = (PendingUnlinkEntry *) lfirst(cell);
529529

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;
533533
}
534534
}
535535
else if (type == SYNC_UNLINK_REQUEST)

0 commit comments

Comments
 (0)