From: Heikki Linnakangas Date: Sat, 22 Oct 2011 17:16:05 +0000 (+0300) Subject: Fix overly-complicated usage of errcode_for_file_access(). X-Git-Tag: REL9_1_2~62 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e8ac0894b196c4dd8618bca1f598f13bf5e18ea;p=postgresql Fix overly-complicated usage of errcode_for_file_access(). No need to do "errcode(errcode_for_file_access())", just "errcode_for_file_access()" is enough. The extra errcode() call is useless but harmless, so there's no user-visible bug here. Nevertheless, backpatch to 9.1 where this code were added. --- diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c index 231a1de2f5..d6ed49a26f 100644 --- a/src/backend/replication/basebackup.c +++ b/src/backend/replication/basebackup.c @@ -586,7 +586,7 @@ sendDir(char *path, int basepathlen, bool sizeonly) { if (errno != ENOENT) ereport(ERROR, - (errcode(errcode_for_file_access()), + (errcode_for_file_access(), errmsg("could not stat file or directory \"%s\": %m", pathbuf))); @@ -628,7 +628,7 @@ sendDir(char *path, int basepathlen, bool sizeonly) MemSet(linkpath, 0, sizeof(linkpath)); if (readlink(pathbuf, linkpath, sizeof(linkpath) - 1) == -1) ereport(ERROR, - (errcode(errcode_for_file_access()), + (errcode_for_file_access(), errmsg("could not read symbolic link \"%s\": %m", pathbuf))); if (!sizeonly) @@ -722,7 +722,7 @@ sendFile(char *readfilename, char *tarfilename, struct stat * statbuf) fp = AllocateFile(readfilename, "rb"); if (fp == NULL) ereport(ERROR, - (errcode(errcode_for_file_access()), + (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", readfilename))); /*