Mark pg_upgrade's free_db_and_rel_infos() as a static function.

bmomjian · bmomjian · commit dec10ba4c5dc · 2012-11-13T21:10:40.000-05:00
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
@@ -18,6 +18,7 @@ static void create_rel_filename_map(const char *old_data, const char *new_data,
 						const DbInfo *old_db, const DbInfo *new_db,
 						const RelInfo *old_rel, const RelInfo *new_rel,
 						FileNameMap *map);
+static void free_db_and_rel_infos(DbInfoArr *db_arr);
 static void get_db_infos(ClusterInfo *cluster);
 static void get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo);
 static void free_rel_infos(RelInfoArr *rel_arr);
@@ -370,7 +371,7 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
 }
 
 
-void
+static void
 free_db_and_rel_infos(DbInfoArr *db_arr)
 {
 	int			dbnum;
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
@@ -388,7 +388,6 @@ FileNameMap *gen_db_file_maps(DbInfo *old_db,
 				 DbInfo *new_db, int *nmaps, const char *old_pgdata,
 				 const char *new_pgdata);
 void		get_db_and_rel_infos(ClusterInfo *cluster);
-void		free_db_and_rel_infos(DbInfoArr *db_arr);
 void print_maps(FileNameMap *maps, int n,
 		   const char *db_name);
 

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ static void create_rel_filename_map(const char old_data, const char new_data,`
`18`	`18`	`const DbInfo old_db, const DbInfo new_db,`
`19`	`19`	`const RelInfo old_rel, const RelInfo new_rel,`
`20`	`20`	`FileNameMap *map);`
	`21`	`+static void free_db_and_rel_infos(DbInfoArr *db_arr);`
`21`	`22`	`static void get_db_infos(ClusterInfo *cluster);`
`22`	`23`	`static void get_rel_infos(ClusterInfo cluster, DbInfo dbinfo);`
`23`	`24`	`static void free_rel_infos(RelInfoArr *rel_arr);`
`@@ -370,7 +371,7 @@ get_rel_infos(ClusterInfo cluster, DbInfo dbinfo)`
`370`	`371`	`}`
`371`	`372`
`372`	`373`
`373`		`-void`
	`374`	`+static void`
`374`	`375`	`free_db_and_rel_infos(DbInfoArr *db_arr)`
`375`	`376`	`{`
`376`	`377`	`int dbnum;`