summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier2019-12-24 03:14:08 +0000
committerMichael Paquier2019-12-24 03:14:08 +0000
commitcce64a51cabc1e59d202d95bb0b92ed22bac73cf (patch)
treec4d936c35802235c15c128abffd4ec91e6104396
parente69d644547785cc9f079650d29118a3688bc5039 (diff)
Replace use of strerror() with %s by %m in pg_waldump
Since d6c55de1, src/port/snprintf.c is able to use %m instead of strerror(). A couple of utilities in src/bin/ have already done the switch, and do it now for pg_waldump as this reduces the workload for translators. Note that more could be done, particularly with pgbench. Thanks to Kyotaro Horiguchi for the discussion. Discussion: https://postgr.es/m/[email protected]
-rw-r--r--src/bin/pg_waldump/pg_waldump.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index a05fbe69388..be4bf49499b 100644
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -142,8 +142,7 @@ open_file_in_directory(const char *directory, const char *fname)
fd = open(fpath, O_RDONLY | PG_BINARY, 0);
if (fd < 0 && errno != ENOENT)
- fatal_error("could not open file \"%s\": %s",
- fname, strerror(errno));
+ fatal_error("could not open file \"%s\": %m", fname);
return fd;
}
@@ -207,8 +206,8 @@ search_directory(const char *directory, const char *fname)
else
{
if (errno != 0)
- fatal_error("could not read file \"%s\": %s",
- fname, strerror(errno));
+ fatal_error("could not read file \"%s\": %m",
+ fname);
else
fatal_error("could not read file \"%s\": read %d of %zu",
fname, r, (Size) XLOG_BLCKSZ);
@@ -316,7 +315,7 @@ WALDumpOpenSegment(XLogSegNo nextSegNo, WALSegmentContext *segcxt,
break;
}
- fatal_error("could not find file \"%s\": %s", fname, strerror(errno));
+ fatal_error("could not find file \"%s\": %m", fname);
return -1; /* keep compiler quiet */
}
@@ -925,8 +924,7 @@ main(int argc, char **argv)
/* validate path points to directory */
if (!verify_directory(waldir))
{
- pg_log_error("path \"%s\" could not be opened: %s",
- waldir, strerror(errno));
+ pg_log_error("could not open directory \"%s\": %m", waldir);
goto bad_argument;
}
}
@@ -946,8 +944,7 @@ main(int argc, char **argv)
waldir = directory;
if (!verify_directory(waldir))
- fatal_error("could not open directory \"%s\": %s",
- waldir, strerror(errno));
+ fatal_error("could not open directory \"%s\": %m", waldir);
}
waldir = identify_target_directory(waldir, fname);