Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitb4a7e59

Browse files
committed
Cleanup ClusterInfo initialization in pg_upgrade
1 parent3a08736 commitb4a7e59

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

‎contrib/pg_upgrade/info.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ static void free_rel_infos(RelInfoArr *rel_arr);
2222
staticvoidprint_db_infos(DbInfoArr*dbinfo);
2323
staticvoidprint_rel_infos(RelInfoArr*arr);
2424

25+
void
26+
initialize_cluster_info(ClusterInfo*cluster)
27+
{
28+
cluster->dbarr.ndbs=0;
29+
cluster->dbarr.dbs=NULL;
30+
}
2531

2632
/*
2733
* gen_db_file_maps()

‎contrib/pg_upgrade/pg_upgrade.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@ main(int argc, char **argv)
6363
char*deletion_script_file_name=NULL;
6464
boollive_check= false;
6565

66+
initialize_cluster_info(&old_cluster);
67+
initialize_cluster_info(&new_cluster);
68+
6669
parseCommandLine(argc,argv);
67-
old_cluster.dbarr.ndbs=0;
68-
new_cluster.dbarr.ndbs=0;
6970

7071
output_check_banner(&live_check);
7172

‎contrib/pg_upgrade/pg_upgrade.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ voidcheck_loadable_libraries(void);
326326

327327
/* info.c */
328328

329+
voidinitialize_cluster_info(ClusterInfo*cluster);
329330
FileNameMap*gen_db_file_maps(DbInfo*old_db,
330331
DbInfo*new_db,int*nmaps,constchar*old_pgdata,
331332
constchar*new_pgdata);

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp