diff options
Diffstat (limited to 'src/common/controldata_utils.c')
| -rw-r--r-- | src/common/controldata_utils.c | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/src/common/controldata_utils.c b/src/common/controldata_utils.c index 567281349e0..efca14ba544 100644 --- a/src/common/controldata_utils.c +++ b/src/common/controldata_utils.c @@ -28,6 +28,9 @@ #include "catalog/pg_control.h" #include "common/controldata_utils.h" #include "common/file_perm.h" +#ifdef FRONTEND +#include "fe_utils/logging.h" +#endif #include "port/pg_crc32c.h" #ifndef FRONTEND @@ -45,7 +48,7 @@ * file data is correct. */ ControlFileData * -get_controlfile(const char *DataDir, const char *progname, bool *crc_ok_p) +get_controlfile(const char *DataDir, bool *crc_ok_p) { ControlFileData *ControlFile; int fd; @@ -67,8 +70,8 @@ get_controlfile(const char *DataDir, const char *progname, bool *crc_ok_p) #else if ((fd = open(ControlFilePath, O_RDONLY | PG_BINARY, 0)) == -1) { - fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"), - progname, ControlFilePath, strerror(errno)); + pg_log_fatal("could not open file \"%s\" for reading: %m", + ControlFilePath); exit(EXIT_FAILURE); } #endif @@ -83,8 +86,7 @@ get_controlfile(const char *DataDir, const char *progname, bool *crc_ok_p) errmsg("could not read file \"%s\": %m", ControlFilePath))); #else { - fprintf(stderr, _("%s: could not read file \"%s\": %s\n"), - progname, ControlFilePath, strerror(errno)); + pg_log_fatal("could not read file \"%s\": %m", ControlFilePath); exit(EXIT_FAILURE); } #endif @@ -96,8 +98,8 @@ get_controlfile(const char *DataDir, const char *progname, bool *crc_ok_p) ControlFilePath, r, sizeof(ControlFileData)))); #else { - fprintf(stderr, _("%s: could not read file \"%s\": read %d of %zu\n"), - progname, ControlFilePath, r, sizeof(ControlFileData)); + pg_log_fatal("could not read file \"%s\": read %d of %zu", + ControlFilePath, r, sizeof(ControlFileData)); exit(EXIT_FAILURE); } #endif @@ -112,8 +114,7 @@ get_controlfile(const char *DataDir, const char *progname, bool *crc_ok_p) #else if (close(fd)) { - fprintf(stderr, _("%s: could not close file \"%s\": %s\n"), - progname, ControlFilePath, strerror(errno)); + pg_log_fatal("could not close file \"%s\": %m", ControlFilePath); exit(EXIT_FAILURE); } #endif @@ -133,10 +134,10 @@ get_controlfile(const char *DataDir, const char *progname, bool *crc_ok_p) #ifndef FRONTEND elog(ERROR, _("byte ordering mismatch")); #else - printf(_("WARNING: possible byte ordering mismatch\n" - "The byte ordering used to store the pg_control file might not match the one\n" - "used by this program. In that case the results below would be incorrect, and\n" - "the PostgreSQL installation would be incompatible with this data directory.\n")); + pg_log_warning("possible byte ordering mismatch\n" + "The byte ordering used to store the pg_control file might not match the one\n" + "used by this program. In that case the results below would be incorrect, and\n" + "the PostgreSQL installation would be incompatible with this data directory."); #endif return ControlFile; @@ -152,7 +153,7 @@ get_controlfile(const char *DataDir, const char *progname, bool *crc_ok_p) * routine in the backend. */ void -update_controlfile(const char *DataDir, const char *progname, +update_controlfile(const char *DataDir, ControlFileData *ControlFile, bool do_sync) { int fd; @@ -199,8 +200,7 @@ update_controlfile(const char *DataDir, const char *progname, if ((fd = open(ControlFilePath, O_WRONLY | PG_BINARY, pg_file_create_mode)) == -1) { - fprintf(stderr, _("%s: could not open file \"%s\": %s\n"), - progname, ControlFilePath, strerror(errno)); + pg_log_fatal("could not open file \"%s\": %m", ControlFilePath); exit(EXIT_FAILURE); } #endif @@ -221,8 +221,7 @@ update_controlfile(const char *DataDir, const char *progname, errmsg("could not write file \"%s\": %m", ControlFilePath))); #else - fprintf(stderr, _("%s: could not write \"%s\": %s\n"), - progname, ControlFilePath, strerror(errno)); + pg_log_fatal("could not write file \"%s\": %m", ControlFilePath); exit(EXIT_FAILURE); #endif } @@ -243,8 +242,7 @@ update_controlfile(const char *DataDir, const char *progname, #else if (fsync(fd) != 0) { - fprintf(stderr, _("%s: could not fsync file \"%s\": %s\n"), - progname, ControlFilePath, strerror(errno)); + pg_log_fatal("could not fsync file \"%s\": %m", ControlFilePath); exit(EXIT_FAILURE); } #endif @@ -258,8 +256,7 @@ update_controlfile(const char *DataDir, const char *progname, errmsg("could not close file \"%s\": %m", ControlFilePath))); #else - fprintf(stderr, _("%s: could not close file \"%s\": %s\n"), - progname, ControlFilePath, strerror(errno)); + pg_log_fatal("could not close file \"%s\": %m", ControlFilePath); exit(EXIT_FAILURE); #endif } |