database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-26 01:22:12 +03:00
Code Activity

Pgindent run on pg_upgrade source after restructuring.

Browse Source
This commit is contained in:
Bruce Momjian
2010-10-19 22:37:04 +00:00
parent e13f7e9a71
commit 07456b45e6
14 changed files with 79 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/pg_upgrade/controldata.c
View File

@ -549,9 +549,10 @@ putenv2(const char *var, const char *val)
sprintf(envstr, "%s=%s", var, val); sprintf(envstr, "%s=%s", var, val);
putenv(envstr); putenv(envstr);
/* /*
* Do not free envstr because it becomes part of the environment * Do not free envstr because it becomes part of the environment on
* on some operating systems. See port/unsetenv.c::unsetenv. * some operating systems. See port/unsetenv.c::unsetenv.
*/ */
#else #else
SetEnvironmentVariableA(var, val); SetEnvironmentVariableA(var, val);

3
contrib/pg_upgrade/pg_upgrade.c
View File

@ -22,7 +22,8 @@ static void set_frozenxids(void);
static void setup(char *argv0, bool live_check); static void setup(char *argv0, bool live_check);
static void cleanup(void); static void cleanup(void);
ClusterInfo old_cluster, new_cluster; ClusterInfo old_cluster,
new_cluster;
OSInfo os_info; OSInfo os_info;
int int

3
contrib/pg_upgrade/pg_upgrade.h
View File

@ -242,7 +242,8 @@ typedef struct
*/ */
extern Log log; extern Log log;
extern UserOpts user_opts; extern UserOpts user_opts;
extern ClusterInfo old_cluster, new_cluster; extern ClusterInfo old_cluster,
new_cluster;
extern OSInfo os_info; extern OSInfo os_info;
extern char scandir_file_pattern[]; extern char scandir_file_pattern[];

4
contrib/pg_upgrade/server.c
View File

@ -175,8 +175,8 @@ start_postmaster(Cluster whichCluster, bool quiet)
/* /*
* On Win32, we can't send both pg_upgrade output and pg_ctl output to the * On Win32, we can't send both pg_upgrade output and pg_ctl output to the
* same file because we get the error: "The process cannot access the file * same file because we get the error: "The process cannot access the file
* because it is being used by another process." so we have to send all other * because it is being used by another process." so we have to send all
* output to 'nul'. * other output to 'nul'.
*/ */
snprintf(cmd, sizeof(cmd), snprintf(cmd, sizeof(cmd),
SYSTEMQUOTE "\"%s/pg_ctl\" -l \"%s\" -D \"%s\" " SYSTEMQUOTE "\"%s/pg_ctl\" -l \"%s\" -D \"%s\" "