summaryrefslogtreecommitdiff
path: root/src/bin/scripts
diff options
context:
space:
mode:
authorTom Lane2019-05-22 17:04:48 +0000
committerTom Lane2019-05-22 17:04:48 +0000
commit8255c7a5eeba8f1a38b7a431c04909bde4f5e67d (patch)
tree50b5b32eaf388701b2714244a10fb23f8d4a2c7c /src/bin/scripts
parentbe76af171cdb3e7465c4ef234af403f97ad79b7b (diff)
Phase 2 pgindent run for v12.
Switch to 2.1 version of pg_bsd_indent. This formats multiline function declarations "correctly", that is with additional lines of parameter declarations indented to match where the first line's left parenthesis is. Discussion: https://postgr.es/m/CAEepm=0P3FeTXRcU5B2W3jv3PgRVZ-kGUXLGfd42FFhUROO3ug@mail.gmail.com
Diffstat (limited to 'src/bin/scripts')
-rw-r--r--src/bin/scripts/clusterdb.c12
-rw-r--r--src/bin/scripts/common.h26
-rw-r--r--src/bin/scripts/reindexdb.c24
-rw-r--r--src/bin/scripts/vacuumdb.c32
4 files changed, 47 insertions, 47 deletions
diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index a1b4119efa..15fff91e16 100644
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -17,13 +17,13 @@
static void cluster_one_database(const char *dbname, bool verbose, const char *table,
- const char *host, const char *port,
- const char *username, enum trivalue prompt_password,
- const char *progname, bool echo);
+ const char *host, const char *port,
+ const char *username, enum trivalue prompt_password,
+ const char *progname, bool echo);
static void cluster_all_databases(bool verbose, const char *maintenance_db,
- const char *host, const char *port,
- const char *username, enum trivalue prompt_password,
- const char *progname, bool echo, bool quiet);
+ const char *host, const char *port,
+ const char *username, enum trivalue prompt_password,
+ const char *progname, bool echo, bool quiet);
static void help(const char *progname);
diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h
index b59ade0c39..35d1a3e0d5 100644
--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -26,33 +26,33 @@ extern bool CancelRequested;
typedef void (*help_handler) (const char *progname);
extern void handle_help_version_opts(int argc, char *argv[],
- const char *fixed_progname,
- help_handler hlp);
+ const char *fixed_progname,
+ help_handler hlp);
extern PGconn *connectDatabase(const char *dbname, const char *pghost,
- const char *pgport, const char *pguser,
- enum trivalue prompt_password, const char *progname,
- bool echo, bool fail_ok, bool allow_password_reuse);
+ const char *pgport, const char *pguser,
+ enum trivalue prompt_password, const char *progname,
+ bool echo, bool fail_ok, bool allow_password_reuse);
extern PGconn *connectMaintenanceDatabase(const char *maintenance_db,
- const char *pghost, const char *pgport,
- const char *pguser, enum trivalue prompt_password,
- const char *progname, bool echo);
+ const char *pghost, const char *pgport,
+ const char *pguser, enum trivalue prompt_password,
+ const char *progname, bool echo);
extern PGresult *executeQuery(PGconn *conn, const char *query,
- const char *progname, bool echo);
+ const char *progname, bool echo);
extern void executeCommand(PGconn *conn, const char *query,
- const char *progname, bool echo);
+ const char *progname, bool echo);
extern bool executeMaintenanceCommand(PGconn *conn, const char *query,
- bool echo);
+ bool echo);
extern void splitTableColumnsSpec(const char *spec, int encoding,
- char **table, const char **columns);
+ char **table, const char **columns);
extern void appendQualifiedRelation(PQExpBuffer buf, const char *name,
- PGconn *conn, const char *progname, bool echo);
+ PGconn *conn, const char *progname, bool echo);
extern bool yesno_prompt(const char *question);
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index ba4d10e65c..bec57589d3 100644
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -17,20 +17,20 @@
static void reindex_one_database(const char *name, const char *dbname,
- const char *type, const char *host,
- const char *port, const char *username,
- enum trivalue prompt_password, const char *progname,
- bool echo, bool verbose, bool concurrently);
+ const char *type, const char *host,
+ const char *port, const char *username,
+ enum trivalue prompt_password, const char *progname,
+ bool echo, bool verbose, bool concurrently);
static void reindex_all_databases(const char *maintenance_db,
- const char *host, const char *port,
- const char *username, enum trivalue prompt_password,
- const char *progname, bool echo,
- bool quiet, bool verbose, bool concurrently);
+ const char *host, const char *port,
+ const char *username, enum trivalue prompt_password,
+ const char *progname, bool echo,
+ bool quiet, bool verbose, bool concurrently);
static void reindex_system_catalogs(const char *dbname,
- const char *host, const char *port,
- const char *username, enum trivalue prompt_password,
- const char *progname, bool echo, bool verbose,
- bool concurrently);
+ const char *host, const char *port,
+ const char *username, enum trivalue prompt_password,
+ const char *progname, bool echo, bool verbose,
+ bool concurrently);
static void help(const char *progname);
int
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 6d216aab6b..df2a315f95 100644
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -50,32 +50,32 @@ typedef struct vacuumingOptions
static void vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
- int stage,
- SimpleStringList *tables,
- const char *host, const char *port,
- const char *username, enum trivalue prompt_password,
- int concurrentCons,
- const char *progname, bool echo, bool quiet);
+ int stage,
+ SimpleStringList *tables,
+ const char *host, const char *port,
+ const char *username, enum trivalue prompt_password,
+ int concurrentCons,
+ const char *progname, bool echo, bool quiet);
static void vacuum_all_databases(vacuumingOptions *vacopts,
- bool analyze_in_stages,
- const char *maintenance_db,
- const char *host, const char *port,
- const char *username, enum trivalue prompt_password,
- int concurrentCons,
- const char *progname, bool echo, bool quiet);
+ bool analyze_in_stages,
+ const char *maintenance_db,
+ const char *host, const char *port,
+ const char *username, enum trivalue prompt_password,
+ int concurrentCons,
+ const char *progname, bool echo, bool quiet);
static void prepare_vacuum_command(PQExpBuffer sql, int serverVersion,
- vacuumingOptions *vacopts, const char *table);
+ vacuumingOptions *vacopts, const char *table);
static void run_vacuum_command(PGconn *conn, const char *sql, bool echo,
- const char *table, const char *progname, bool async);
+ const char *table, const char *progname, bool async);
static ParallelSlot *GetIdleSlot(ParallelSlot slots[], int numslots,
- const char *progname);
+ const char *progname);
static bool ProcessQueryResult(PGconn *conn, PGresult *result,
- const char *progname);
+ const char *progname);
static bool GetQueryResult(PGconn *conn, const char *progname);