summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2023-01-12 06:37:39 +0000
committerPeter Eisentraut2023-01-12 06:37:39 +0000
commit881fa869c6b0c4e2f310d1c145141dd9d6f53774 (patch)
tree4f42e4cdb0bb209ac89e574880e758cdadd5e3bd
parent8607630d74cd83f636a72eb9f2eb62f67e1fb955 (diff)
Code cleanup
for commit c96de2ce1782116bd0489b1cd69ba88189a495e8 Author: Nathan Bossart <[email protected]> Discussion: https://www.postgresql.org/message-id/20230111185434.GA1912982@nathanxps13
-rw-r--r--src/backend/access/transam/xlogarchive.c3
-rw-r--r--src/common/archive.c2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/backend/access/transam/xlogarchive.c b/src/backend/access/transam/xlogarchive.c
index f911e8c3a6..fcc87ff44f 100644
--- a/src/backend/access/transam/xlogarchive.c
+++ b/src/backend/access/transam/xlogarchive.c
@@ -154,9 +154,6 @@ RestoreArchivedFile(char *path, const char *xlogfname,
xlogRestoreCmd = BuildRestoreCommand(recoveryRestoreCommand,
xlogpath, xlogfname,
lastRestartPointFname);
- if (xlogRestoreCmd == NULL)
- elog(ERROR, "could not build restore command \"%s\"",
- recoveryRestoreCommand);
ereport(DEBUG3,
(errmsg_internal("executing restore command \"%s\"",
diff --git a/src/common/archive.c b/src/common/archive.c
index de42e914f7..641a58ee88 100644
--- a/src/common/archive.c
+++ b/src/common/archive.c
@@ -33,7 +33,7 @@
* The result is a palloc'd string for the restore command built. The
* caller is responsible for freeing it. If any of the required arguments
* is NULL and that the corresponding alias is found in the command given
- * by the caller, then NULL is returned.
+ * by the caller, then an error is thrown.
*/
char *
BuildRestoreCommand(const char *restoreCommand,