diff options
| author | Michael Paquier <michael@paquier.xyz> | 2024-03-12 10:02:54 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2024-03-12 10:02:54 +0900 |
| commit | 2c8118ee5d980e11f73683fcda2329c323aa381e (patch) | |
| tree | 7527eb2a94bc9cc8821ff9afba62e03918dff351 /src/bin/pg_upgrade/exec.c | |
| parent | 3045324214467dd3f0bef31f6f33562b9eb93aa3 (diff) | |
Use printf's %m format instead of strerror(errno) in more places
Most callers of strerror() are removed from the backend code. The
remaining callers require special handling with a saved errno from a
previous system call. The frontend code still needs strerror() where
error states need to be handled outside of fprintf.
Note that pg_regress is not changed to use %m as the TAP output may
clobber errno, since those functions call fprintf() and friends before
evaluating the format string.
Support for %m in src/port/snprintf.c has been added in d6c55de1f99a,
hence all the stable branches currently supported include it.
Author: Dagfinn Ilmari Mannsåker
Discussion: https://postgr.es/m/87sf13jhuw.fsf@wibble.ilmari.org
Diffstat (limited to 'src/bin/pg_upgrade/exec.c')
| -rw-r--r-- | src/bin/pg_upgrade/exec.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/bin/pg_upgrade/exec.c b/src/bin/pg_upgrade/exec.c index 3552cf00afb..058530ab3e9 100644 --- a/src/bin/pg_upgrade/exec.c +++ b/src/bin/pg_upgrade/exec.c @@ -44,8 +44,7 @@ get_bin_version(ClusterInfo *cluster) if ((output = popen(cmd, "r")) == NULL || fgets(cmd_output, sizeof(cmd_output), output) == NULL) - pg_fatal("could not get pg_ctl version data using %s: %s", - cmd, strerror(errno)); + pg_fatal("could not get pg_ctl version data using %s: %m", cmd); rc = pclose(output); if (rc != 0) @@ -242,8 +241,7 @@ pid_lock_file_exists(const char *datadir) { /* ENOTDIR means we will throw a more useful error later */ if (errno != ENOENT && errno != ENOTDIR) - pg_fatal("could not open file \"%s\" for reading: %s", - path, strerror(errno)); + pg_fatal("could not open file \"%s\" for reading: %m", path); return false; } @@ -322,8 +320,8 @@ check_single_dir(const char *pg_data, const char *subdir) subdir); if (stat(subDirName, &statBuf) != 0) - report_status(PG_FATAL, "check for \"%s\" failed: %s", - subDirName, strerror(errno)); + report_status(PG_FATAL, "check for \"%s\" failed: %m", + subDirName); else if (!S_ISDIR(statBuf.st_mode)) report_status(PG_FATAL, "\"%s\" is not a directory", subDirName); @@ -388,8 +386,8 @@ check_bin_dir(ClusterInfo *cluster, bool check_versions) /* check bindir */ if (stat(cluster->bindir, &statBuf) != 0) - report_status(PG_FATAL, "check for \"%s\" failed: %s", - cluster->bindir, strerror(errno)); + report_status(PG_FATAL, "check for \"%s\" failed: %m", + cluster->bindir); else if (!S_ISDIR(statBuf.st_mode)) report_status(PG_FATAL, "\"%s\" is not a directory", cluster->bindir); |