Replace use of strerror() with %s by %m in pg_waldump
authorMichael Paquier <[email protected]>
Tue, 24 Dec 2019 03:14:08 +0000 (12:14 +0900)
committerMichael Paquier <[email protected]>
Tue, 24 Dec 2019 03:14:08 +0000 (12:14 +0900)
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/20191129065115[email protected]

src/bin/pg_waldump/pg_waldump.c

index a05fbe69388bed07646af7f937346d367eaafe4f..be4bf49499b5a1b35757e8e8102db24744d9907e 100644 (file)
@@ -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);