Replace use of strerror() with %s by %m in pg_waldump

michaelpq · michaelpq · commit cce64a51cabc · 2019-12-24T12:14:08.000+09:00
Since d6c55de, 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.GM2505@paquier.xyz
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,7 @@ open_file_in_directory(const char directory, const char fname)`
`142`	`142`	`fd = open(fpath, O_RDONLY \| PG_BINARY, 0);`
`143`	`143`
`144`	`144`	`if (fd < 0 && errno != ENOENT)`
`145`		`- fatal_error("could not open file \"%s\": %s",`
`146`		`- fname, strerror(errno));`
	`145`	`+ fatal_error("could not open file \"%s\": %m", fname);`
`147`	`146`	`return fd;`
`148`	`147`	`}`
`149`	`148`
`@@ -207,8 +206,8 @@ search_directory(const char directory, const char fname)`
`207`	`206`	`else`
`208`	`207`	`{`
`209`	`208`	`if (errno != 0)`
`210`		`- fatal_error("could not read file \"%s\": %s",`
`211`		`- fname, strerror(errno));`
	`209`	`+ fatal_error("could not read file \"%s\": %m",`
	`210`	`+ fname);`
`212`	`211`	`else`
`213`	`212`	`fatal_error("could not read file \"%s\": read %d of %zu",`
`214`	`213`	`fname, r, (Size) XLOG_BLCKSZ);`
`@@ -316,7 +315,7 @@ WALDumpOpenSegment(XLogSegNo nextSegNo, WALSegmentContext *segcxt,`
`316`	`315`	`break;`
`317`	`316`	`}`
`318`	`317`
`319`		`- fatal_error("could not find file \"%s\": %s", fname, strerror(errno));`
	`318`	`+ fatal_error("could not find file \"%s\": %m", fname);`
`320`	`319`	`return -1; /* keep compiler quiet */`
`321`	`320`	`}`
`322`	`321`
`@@ -925,8 +924,7 @@ main(int argc, char **argv)`
`925`	`924`	`/* validate path points to directory */`
`926`	`925`	`if (!verify_directory(waldir))`
`927`	`926`	`{`
`928`		`- pg_log_error("path \"%s\" could not be opened: %s",`
`929`		`- waldir, strerror(errno));`
	`927`	`+ pg_log_error("could not open directory \"%s\": %m", waldir);`
`930`	`928`	`goto bad_argument;`
`931`	`929`	`}`
`932`	`930`	`}`
`@@ -946,8 +944,7 @@ main(int argc, char **argv)`
`946`	`944`	`waldir = directory;`
`947`	`945`
`948`	`946`	`if (!verify_directory(waldir))`
`949`		`- fatal_error("could not open directory \"%s\": %s",`
`950`		`- waldir, strerror(errno));`
	`947`	`+ fatal_error("could not open directory \"%s\": %m", waldir);`
`951`	`948`	`}`
`952`	`949`
`953`	`950`	`waldir = identify_target_directory(waldir, fname);`