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

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

diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index 7a5a0501f7f39e63da54f26a561e1e004dba8b09..0c518a2d1b4b69104f27e2a3bba1333c681c5e03 100644 (file)
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@@ -22,12 +22,6 @@ static void free_rel_infos(RelInfoArr *rel_arr);
 static void print_db_infos(DbInfoArr *dbinfo);
 static void print_rel_infos(RelInfoArr *arr);
 
-void
-initialize_cluster_info(ClusterInfo *cluster)
-{
-   cluster->dbarr.ndbs = 0;
-   cluster->dbarr.dbs = NULL;
-}
 
 /*
  * gen_db_file_maps()

diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
index 319ee791e1e3459c15ec86353bb4b0233c2c07b0..061544cac889fcb1bd77878a9b810f811c146838 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -63,9 +63,6 @@ main(int argc, char **argv)
    char       *deletion_script_file_name = NULL;
    bool        live_check = false;
 
-   initialize_cluster_info(&old_cluster);
-   initialize_cluster_info(&new_cluster);
-
    parseCommandLine(argc, argv);
 
    output_check_banner(&live_check);
@@ -428,31 +425,10 @@ set_frozenxids(void)
 static void
 cleanup(void)
 {
-   int         tblnum;
    char        filename[MAXPGPATH];
 
-   for (tblnum = 0; tblnum < os_info.num_tablespaces; tblnum++)
-       pg_free(os_info.tablespaces[tblnum]);
-   pg_free(os_info.tablespaces);
-
-   free_db_and_rel_infos(&old_cluster.dbarr);
-   free_db_and_rel_infos(&new_cluster.dbarr);
-   pg_free(log_opts.filename);
-   pg_free(os_info.user);
-   pg_free(old_cluster.controldata.lc_collate);
-   pg_free(new_cluster.controldata.lc_collate);
-   pg_free(old_cluster.controldata.lc_ctype);
-   pg_free(new_cluster.controldata.lc_ctype);
-   pg_free(old_cluster.controldata.encoding);
-   pg_free(new_cluster.controldata.encoding);
-   pg_free(old_cluster.tablespace_suffix);
-   pg_free(new_cluster.tablespace_suffix);
-
-   if (log_opts.fd != NULL)
-   {
+   if (log_opts.fd)
        fclose(log_opts.fd);
-       log_opts.fd = NULL;
-   }
 
    if (log_opts.debug_fd)
        fclose(log_opts.debug_fd);

diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index 598625bcd1ab20fbb886935464f3e4ae4487eba4..446195273c1cf307e331c3822a421af8c3e62447 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -326,7 +326,6 @@ void        check_loadable_libraries(void);
 
 /* info.c */
 
-void       initialize_cluster_info(ClusterInfo *cluster);
 FileNameMap *gen_db_file_maps(DbInfo *old_db,
                 DbInfo *new_db, int *nmaps, const char *old_pgdata,
                 const char *new_pgdata);