diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index d5431297a1..b19e6f0181 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -880,10 +880,10 @@ ReadOneStatement(StringInfo inBuf, FILE *pfile)
 /*
  * filter_dbnames_for_restore
  *
- * This will remove names from all dblist those can
- * be constructed from database_exclude_pattern list.
+ * This will remove entries from dbname_oid_list that pattern matching any in the
+ * db_exclude_patterns list. dbname_oid_list maybe inplace modified.
  *
- * returns number of dbnames those will be restored.
+ * returns number of database will be restored.
  */
 static int
 filter_dbnames_for_restore(PGconn *conn,
@@ -922,7 +922,7 @@ filter_dbnames_for_restore(PGconn *conn,
 			 * pg_catalog.default
 			 *
 			 * XXX represents the string literal database name derived from the
-			 * dboid_list variable, which is initially extracted from the
+			 * dbname_oid_list, which is initially extracted from the
 			 * map.dat file located in the backup directory.  that's why we
 			 * need quote_literal_cstr.
 			 *
@@ -972,7 +972,7 @@ filter_dbnames_for_restore(PGconn *conn,
 		}
 		else
 		{
-			count_db++; /* Increment db counter. */
+			count_db++;
 			dboidprecell = dboid_cell;
 		}
 
@@ -1160,7 +1160,7 @@ restoreAllDatabases(PGconn *conn, const char *dumpdirpath,
 
 		/* Restore single database and save exit_code. */
 		dbexit_code = restoreOneDatabase(subdirpath, opts, numWorkers,
-				true, dboid_cell->db_name);
+										 true, dboid_cell->db_name);
 
 		/* Store exit_code to report it back. */
 		if (exit_code == 0 && dbexit_code != 0)
@@ -1282,7 +1282,7 @@ copy_global_file_to_out_file(const char *outfile, FILE *pfile)
  */
 static void
 simple_db_oid_list_append(SimpleDatabaseOidList *list, Oid db_oid,
-		const char *dbname)
+						  const char *dbname)
 {
 	SimpleDatabaseOidListCell *cell;
 
@@ -1350,8 +1350,8 @@ simple_string_full_list_delete(SimpleStringList *list)
  */
 static void
 simple_db_oid_list_delete(SimpleDatabaseOidList *list,
-		SimpleDatabaseOidListCell *cell,
-		SimpleDatabaseOidListCell *prev)
+						  SimpleDatabaseOidListCell *cell,
+						  SimpleDatabaseOidListCell *prev)
 {
 	if (prev == NULL)
 	{