diff options
| author | Bruce Momjian <bruce@momjian.us> | 2013-05-29 16:58:43 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2013-05-29 16:58:43 -0400 |
| commit | 9af4159fce6654aa0e081b00d02bca40b978745c (patch) | |
| tree | 3aa507fc6cc67ed3d9f6ceec4d65d1e56cc08e1a /contrib/pg_upgrade/server.c | |
| parent | 07ab261ef3a9575a4a2bd3045b222d7b3dee2c46 (diff) | |
| download | postgresql-9af4159fce6654aa0e081b00d02bca40b978745c.tar.gz postgresql-9af4159fce6654aa0e081b00d02bca40b978745c.zip | |
pgindent run for release 9.3
This is the first run of the Perl-based pgindent script. Also update
pgindent instructions.
Diffstat (limited to 'contrib/pg_upgrade/server.c')
| -rw-r--r-- | contrib/pg_upgrade/server.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c index ed6775935bc..c1d459dd822 100644 --- a/contrib/pg_upgrade/server.c +++ b/contrib/pg_upgrade/server.c @@ -79,7 +79,7 @@ get_db_conn(ClusterInfo *cluster, const char *db_name) char * cluster_conn_opts(ClusterInfo *cluster) { - static char conn_opts[MAXPGPATH + NAMEDATALEN + 100]; + static char conn_opts[MAXPGPATH + NAMEDATALEN + 100]; if (cluster->sockdir) snprintf(conn_opts, sizeof(conn_opts), @@ -192,7 +192,7 @@ start_postmaster(ClusterInfo *cluster, bool throw_error) strcat(socket_string, " -c listen_addresses='' -c unix_socket_permissions=0700"); - /* Have a sockdir? Tell the postmaster. */ + /* Have a sockdir? Tell the postmaster. */ if (cluster->sockdir) snprintf(socket_string + strlen(socket_string), sizeof(socket_string) - strlen(socket_string), @@ -215,13 +215,13 @@ start_postmaster(ClusterInfo *cluster, bool throw_error) * win on ext4. */ snprintf(cmd, sizeof(cmd), - "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" -o \"-p %d%s%s %s%s\" start", + "\"%s/pg_ctl\" -w -l \"%s\" -D \"%s\" -o \"-p %d%s%s %s%s\" start", cluster->bindir, SERVER_LOG_FILE, cluster->pgconfig, cluster->port, (cluster->controldata.cat_ver >= BINARY_UPGRADE_SERVER_FLAG_CAT_VER) ? " -b" : " -c autovacuum=off -c autovacuum_freeze_max_age=2000000000", (cluster == &new_cluster) ? - " -c synchronous_commit=off -c fsync=off -c full_page_writes=off" : "", + " -c synchronous_commit=off -c fsync=off -c full_page_writes=off" : "", cluster->pgopts ? cluster->pgopts : "", socket_string); /* @@ -229,7 +229,7 @@ start_postmaster(ClusterInfo *cluster, bool throw_error) * it might supply a reason for the failure. */ pg_ctl_return = exec_prog(SERVER_START_LOG_FILE, - /* pass both file names if they differ */ + /* pass both file names if they differ */ (strcmp(SERVER_LOG_FILE, SERVER_START_LOG_FILE) != 0) ? SERVER_LOG_FILE : NULL, @@ -238,7 +238,7 @@ start_postmaster(ClusterInfo *cluster, bool throw_error) if (!pg_ctl_return && !throw_error) return false; - + /* Check to see if we can connect to the server; if not, report it. */ if ((conn = get_db_conn(cluster, "template1")) == NULL || PQstatus(conn) != CONNECTION_OK) |