diff options
| author | Bruce Momjian | 2017-05-17 20:31:56 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2017-05-17 20:31:56 +0000 |
| commit | a6fd7b7a5f7bf3a8aa3f3d076cf09d922c1c6dd2 (patch) | |
| tree | d10454411c05d459abe06df161ab3c1156c5f477 /src/bin/initdb | |
| parent | 8a943324780259757c77c56cfc597347d1150cdb (diff) | |
Post-PG 10 beta1 pgindent run
perltidy run not included.
Diffstat (limited to 'src/bin/initdb')
| -rw-r--r-- | src/bin/initdb/findtimezone.c | 14 | ||||
| -rw-r--r-- | src/bin/initdb/initdb.c | 8 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src/bin/initdb/findtimezone.c b/src/bin/initdb/findtimezone.c index 5d48ffe4a8f..82089f47a0c 100644 --- a/src/bin/initdb/findtimezone.c +++ b/src/bin/initdb/findtimezone.c @@ -998,8 +998,7 @@ static const struct { "Russia TZ 9 Standard Time", "Russia TZ 9 Daylight Time", "Asia/Vladivostok" - }, /* (UTC+10:00) Vladivostok, Magadan - * (RTZ 9) */ + }, /* (UTC+10:00) Vladivostok, Magadan (RTZ 9) */ { "Russia TZ 10 Standard Time", "Russia TZ 10 Daylight Time", "Asia/Magadan" @@ -1007,8 +1006,8 @@ static const struct { "Russia TZ 11 Standard Time", "Russia TZ 11 Daylight Time", "Asia/Anadyr" - }, /* (UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky - * (RTZ 11) */ + }, /* (UTC+12:00) Anadyr, + * Petropavlovsk-Kamchatsky (RTZ 11) */ { "Russian Standard Time", "Russian Daylight Time", "Europe/Moscow" @@ -1021,13 +1020,12 @@ static const struct { "SA Pacific Standard Time", "SA Pacific Daylight Time", "America/Bogota" - }, /* (UTC-05:00) Bogota, Lima, Quito, Rio - * Branco */ + }, /* (UTC-05:00) Bogota, Lima, Quito, Rio Branco */ { "SA Western Standard Time", "SA Western Daylight Time", "America/Caracas" - }, /* (UTC-04:00) Georgetown, La Paz, Manaus, - * San Juan */ + }, /* (UTC-04:00) Georgetown, La Paz, Manaus, San + * Juan */ { "Saint Pierre Standard Time", "Saint Pierre Daylight Time", "America/Miquelon" diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 62aa40a5831..cd2f4b66d00 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -572,7 +572,7 @@ exit_nicely(void) else if (found_existing_xlogdir) { fprintf(stderr, - _("%s: removing contents of WAL directory \"%s\"\n"), + _("%s: removing contents of WAL directory \"%s\"\n"), progname, xlog_dir); if (!rmtree(xlog_dir, false)) fprintf(stderr, _("%s: failed to remove contents of WAL directory\n"), @@ -589,7 +589,7 @@ exit_nicely(void) if (made_new_xlogdir || found_existing_xlogdir) fprintf(stderr, - _("%s: WAL directory \"%s\" not removed at user's request\n"), + _("%s: WAL directory \"%s\" not removed at user's request\n"), progname, xlog_dir); } @@ -2959,9 +2959,9 @@ main(int argc, char *argv[]) {"version", no_argument, NULL, 'V'}, {"debug", no_argument, NULL, 'd'}, {"show", no_argument, NULL, 's'}, - {"noclean", no_argument, NULL, 'n'}, /* for backwards compatibility */ + {"noclean", no_argument, NULL, 'n'}, /* for backwards compatibility */ {"no-clean", no_argument, NULL, 'n'}, - {"nosync", no_argument, NULL, 'N'}, /* for backwards compatibility */ + {"nosync", no_argument, NULL, 'N'}, /* for backwards compatibility */ {"no-sync", no_argument, NULL, 'N'}, {"sync-only", no_argument, NULL, 'S'}, {"waldir", required_argument, NULL, 'X'}, |