Commit497e65f

committed

In pg_upgrade, no need to initialize global struct values; they are

always zeros. Also no need to free memory before we exit.

1 parentbca8b7f commit497e65fCopy full SHA for 497e65f

File tree

-32

lines changed

-32

lines changed

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,6 @@ static void free_rel_infos(RelInfoArr *rel_arr);`
`22`	`22`	`staticvoidprint_db_infos(DbInfoArr*dbinfo);`
`23`	`23`	`staticvoidprint_rel_infos(RelInfoArr*arr);`
`24`	`24`
`25`		`-void`
`26`		`-initialize_cluster_info(ClusterInfo*cluster)`
`27`		`-{`
`28`		`-cluster->dbarr.ndbs=0;`
`29`		`-cluster->dbarr.dbs=NULL;`
`30`		`-}`
`31`	`25`
`32`	`26`	`/*`
`33`	`27`	`* gen_db_file_maps()`

Lines changed: 1 addition & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,6 @@ main(int argc, char **argv)`
`63`	`63`	`char*deletion_script_file_name=NULL;`
`64`	`64`	`boollive_check= false;`
`65`	`65`
`66`		`-initialize_cluster_info(&old_cluster);`
`67`		`-initialize_cluster_info(&new_cluster);`
`68`		`-`
`69`	`66`	`parseCommandLine(argc,argv);`
`70`	`67`
`71`	`68`	`output_check_banner(&live_check);`
`@@ -428,31 +425,10 @@ set_frozenxids(void)`
`428`	`425`	`staticvoid`
`429`	`426`	`cleanup(void)`
`430`	`427`	`{`
`431`		`-inttblnum;`
`432`	`428`	`charfilename[MAXPGPATH];`
`433`	`429`
`434`		`-for (tblnum=0;tblnum<os_info.num_tablespaces;tblnum++)`
`435`		`-pg_free(os_info.tablespaces[tblnum]);`
`436`		`-pg_free(os_info.tablespaces);`
`437`		`-`
`438`		`-free_db_and_rel_infos(&old_cluster.dbarr);`
`439`		`-free_db_and_rel_infos(&new_cluster.dbarr);`
`440`		`-pg_free(log_opts.filename);`
`441`		`-pg_free(os_info.user);`
`442`		`-pg_free(old_cluster.controldata.lc_collate);`
`443`		`-pg_free(new_cluster.controldata.lc_collate);`
`444`		`-pg_free(old_cluster.controldata.lc_ctype);`
`445`		`-pg_free(new_cluster.controldata.lc_ctype);`
`446`		`-pg_free(old_cluster.controldata.encoding);`
`447`		`-pg_free(new_cluster.controldata.encoding);`
`448`		`-pg_free(old_cluster.tablespace_suffix);`
`449`		`-pg_free(new_cluster.tablespace_suffix);`
`450`		`-`
`451`		`-if (log_opts.fd!=NULL)`
`452`		`-{`
	`430`	`+if (log_opts.fd)`
`453`	`431`	`fclose(log_opts.fd);`
`454`		`-log_opts.fd=NULL;`
`455`		`-}`
`456`	`432`
`457`	`433`	`if (log_opts.debug_fd)`
`458`	`434`	`fclose(log_opts.debug_fd);`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,6 @@ voidcheck_loadable_libraries(void);`
`326`	`326`
`327`	`327`	`/* info.c */`
`328`	`328`
`329`		`-voidinitialize_cluster_info(ClusterInfo*cluster);`
`330`	`329`	`FileNameMapgen_db_file_maps(DbInfoold_db,`
`331`	`330`	`DbInfonew_db,intnmaps,constchar*old_pgdata,`
`332`	`331`	`constchar*new_pgdata);`

Comments

(0)