Avoid shadowing a variable in sync.c.
authorThomas Munro <tmunro@postgresql.org>
Tue, 12 Jul 2022 04:17:36 +0000 (16:17 +1200)
committerThomas Munro <tmunro@postgresql.org>
Thu, 14 Jul 2022 12:06:32 +0000 (00:06 +1200)
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

src/backend/storage/sync/sync.c

index e1fb63100386825d7f1ac768f19db1124960653e..9d6a9e91090b7ab216c5d4374bd552d8a7fbaf37 100644 (file)
@@ -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)