diff options
| author | Bruce Momjian <bruce@momjian.us> | 2012-12-04 09:52:00 -0500 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2012-12-04 09:52:00 -0500 |
| commit | a84c30dda57a177487336785927503064c6bd529 (patch) | |
| tree | 3f9c59a78bc5bd344e39bce1a74b7e6b334af813 /src | |
| parent | c47d261c07c77d1261c048e5cc1236000188ce86 (diff) | |
| download | postgresql-a84c30dda57a177487336785927503064c6bd529.tar.gz postgresql-a84c30dda57a177487336785927503064c6bd529.zip | |
In initdb.c, move auth warning code into main() from secondary function.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/initdb/initdb.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index d44281bece0..40740dcb723 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -3411,14 +3411,6 @@ initialize_data_directory(void) make_template0(); make_postgres(); - - if (do_sync) - perform_fsync(); - else - printf(_("\nSync to disk skipped.\nThe data directory might become corrupt if the operating system crashes.\n")); - - if (authwarning != NULL) - fprintf(stderr, "%s", authwarning); } @@ -3647,6 +3639,14 @@ main(int argc, char *argv[]) initialize_data_directory(); + if (do_sync) + perform_fsync(); + else + printf(_("\nSync to disk skipped.\nThe data directory might become corrupt if the operating system crashes.\n")); + + if (authwarning != NULL) + fprintf(stderr, "%s", authwarning); + /* Get directory specification used to start this executable */ strlcpy(bin_dir, argv[0], sizeof(bin_dir)); get_parent_directory(bin_dir); |