@@ -47,33 +47,33 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db,
4747
4848for (relnum = 0 ;relnum < old_db -> rel_arr .nrels ;relnum ++ )
4949{
50- RelInfo * oldrel = & old_db -> rel_arr .rels [relnum ];
51- RelInfo * newrel ;
50+ RelInfo * old_rel = & old_db -> rel_arr .rels [relnum ];
51+ RelInfo * new_rel ;
5252
5353/* toast tables are handled by their parents */
54- if (strcmp (oldrel -> nspname ,"pg_toast" )== 0 )
54+ if (strcmp (old_rel -> nspname ,"pg_toast" )== 0 )
5555continue ;
5656
57- newrel = relarr_lookup_rel_name (& old_cluster ,& old_db -> rel_arr ,
58- oldrel -> nspname ,oldrel -> relname );
57+ new_rel = relarr_lookup_rel_name (& new_cluster ,& new_db -> rel_arr ,
58+ old_rel -> nspname ,old_rel -> relname );
5959
6060create_rel_filename_map (old_pgdata ,new_pgdata ,old_db ,new_db ,
61- oldrel , newrel ,maps + num_maps );
61+ old_rel , new_rel ,maps + num_maps );
6262num_maps ++ ;
6363
6464/*
6565 * So much for mapping this relation; now we need a mapping
6666 * for its corresponding toast relation and toast index, if any.
6767 */
68- if (oldrel -> toastrelid > 0 )
68+ if (old_rel -> toastrelid > 0 )
6969{
7070char old_name [MAXPGPATH ],new_name [MAXPGPATH ];
7171RelInfo * old_toast ,* new_toast ;
7272
7373old_toast = relarr_lookup_rel_oid (& old_cluster ,& old_db -> rel_arr ,
74- oldrel -> toastrelid );
74+ old_rel -> toastrelid );
7575new_toast = relarr_lookup_rel_oid (& new_cluster ,& new_db -> rel_arr ,
76- newrel -> toastrelid );
76+ new_rel -> toastrelid );
7777
7878create_rel_filename_map (old_pgdata ,new_pgdata ,old_db ,new_db ,
7979old_toast ,new_toast ,maps + num_maps );