aboutsummaryrefslogtreecommitdiff
path: root/src/bin/initdb/initdb.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2017-06-21 14:39:04 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2017-06-21 14:39:04 -0400
commite3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 (patch)
tree8dc7df95c340803546152724fbc17aee4b8527f9 /src/bin/initdb/initdb.c
parent8ff6d4ec7840b0af56f1207073f44b7f2afae96d (diff)
downloadpostgresql-e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89.tar.gz
postgresql-e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89.zip
Initial pgindent run with pg_bsd_indent version 2.0.
The new indent version includes numerous fixes thanks to Piotr Stefaniak. The main changes visible in this commit are: * Nicer formatting of function-pointer declarations. * No longer unexpectedly removes spaces in expressions using casts, sizeof, or offsetof. * No longer wants to add a space in "struct structname *varname", as well as some similar cases for const- or volatile-qualified pointers. * Declarations using PG_USED_FOR_ASSERTS_ONLY are formatted more nicely. * Fixes bug where comments following declarations were sometimes placed with no space separating them from the code. * Fixes some odd decisions for comments following case labels. * Fixes some cases where comments following code were indented to less than the expected column 33. On the less good side, it now tends to put more whitespace around typedef names that are not listed in typedefs.list. This might encourage us to put more effort into typedef name collection; it's not really a bug in indent itself. There are more changes coming after this round, having to do with comment indentation and alignment of lines appearing within parentheses. I wanted to limit the size of the diffs to something that could be reviewed without one's eyes completely glazing over, so it seemed better to split up the changes as much as practical. Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
Diffstat (limited to 'src/bin/initdb/initdb.c')
-rw-r--r--src/bin/initdb/initdb.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index cd2f4b66d00..bc8a8706c16 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1382,7 +1382,7 @@ bootstrap_template1(void)
static void
setup_auth(FILE *cmdfd)
{
- const char *const * line;
+ const char *const *line;
static const char *const pg_authid_setup[] = {
/*
* The authid table shouldn't be readable except through views, to
@@ -1469,7 +1469,7 @@ get_su_pwd(void)
static void
setup_depend(FILE *cmdfd)
{
- const char *const * line;
+ const char *const *line;
static const char *const pg_depend_setup[] = {
/*
* Make PIN entries in pg_depend for all objects made so far in the
@@ -1922,7 +1922,7 @@ vacuum_db(FILE *cmdfd)
static void
make_template0(FILE *cmdfd)
{
- const char *const * line;
+ const char *const *line;
static const char *const template0_setup[] = {
"CREATE DATABASE template0 IS_TEMPLATE = true ALLOW_CONNECTIONS = false;\n\n",
@@ -1960,7 +1960,7 @@ make_template0(FILE *cmdfd)
static void
make_postgres(FILE *cmdfd)
{
- const char *const * line;
+ const char *const *line;
static const char *const postgres_setup[] = {
"CREATE DATABASE postgres;\n\n",
"COMMENT ON DATABASE postgres IS 'default administrative connection database';\n\n",
@@ -2030,7 +2030,7 @@ check_ok(void)
/* Hack to suppress a warning about %x from some versions of gcc */
static inline size_t
-my_strftime(char *s, size_t max, const char *fmt, const struct tm * tm)
+my_strftime(char *s, size_t max, const char *fmt, const struct tm *tm)
{
return strftime(s, max, fmt, tm);
}
@@ -2305,9 +2305,9 @@ check_authmethod_unspecified(const char **authmethod)
}
static void
-check_authmethod_valid(const char *authmethod, const char *const * valid_methods, const char *conntype)
+check_authmethod_valid(const char *authmethod, const char *const *valid_methods, const char *conntype)
{
- const char *const * p;
+ const char *const *p;
for (p = valid_methods; *p; p++)
{