diff options
Diffstat (limited to 'contrib/pg_upgrade')
| -rw-r--r-- | contrib/pg_upgrade/check.c | 8 | ||||
| -rw-r--r-- | contrib/pg_upgrade/tablespace.c | 5 | ||||
| -rw-r--r-- | contrib/pg_upgrade/util.c | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c index 464bbe2604f..936306ce618 100644 --- a/contrib/pg_upgrade/check.c +++ b/contrib/pg_upgrade/check.c @@ -458,10 +458,9 @@ create_script_for_cluster_analyze(char **analyze_script_file_name) prep_status("Creating script to analyze new cluster"); if (os_info.user_specified) - pg_asprintf(&user_specification, "-U \"%s\" ", os_info.user); + user_specification = psprintf("-U \"%s\" ", os_info.user); - pg_asprintf(analyze_script_file_name, "analyze_new_cluster.%s", - SCRIPT_EXT); + *analyze_script_file_name = psprintf("analyze_new_cluster.%s", SCRIPT_EXT); if ((script = fopen_priv(*analyze_script_file_name, "w")) == NULL) pg_fatal("Could not open file \"%s\": %s\n", @@ -592,8 +591,7 @@ create_script_for_old_cluster_deletion(char **deletion_script_file_name) int tblnum; char old_cluster_pgdata[MAXPGPATH]; - pg_asprintf(deletion_script_file_name, "delete_old_cluster.%s", - SCRIPT_EXT); + *deletion_script_file_name = psprintf("delete_old_cluster.%s", SCRIPT_EXT); /* * Some users (oddly) create tablespaces inside the cluster data diff --git a/contrib/pg_upgrade/tablespace.c b/contrib/pg_upgrade/tablespace.c index f090f62b29c..27273662dd2 100644 --- a/contrib/pg_upgrade/tablespace.c +++ b/contrib/pg_upgrade/tablespace.c @@ -86,7 +86,8 @@ set_tablespace_directory_suffix(ClusterInfo *cluster) /* This cluster has a version-specific subdirectory */ /* The leading slash is needed to start a new directory. */ - pg_asprintf(&cluster->tablespace_suffix, "/PG_%s_%d", - cluster->major_version_str, cluster->controldata.cat_ver); + cluster->tablespace_suffix = psprintf("/PG_%s_%d", + cluster->major_version_str, + cluster->controldata.cat_ver); } } diff --git a/contrib/pg_upgrade/util.c b/contrib/pg_upgrade/util.c index 7bca19b84d0..a67bd64043f 100644 --- a/contrib/pg_upgrade/util.c +++ b/contrib/pg_upgrade/util.c @@ -278,7 +278,7 @@ pg_putenv(const char *var, const char *val) #ifndef WIN32 char *envstr; - pg_asprintf(&envstr, "%s=%s", var, val); + envstr = psprintf("%s=%s", var, val); putenv(envstr); /* |