From 2f31f405e1fa561db27e8dc6f7f3cb3dbd8c0c4f Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Wed, 18 Jan 2023 08:55:26 +0900 Subject: [PATCH] Constify the arguments of copydir.h functions This makes sure that the internal logic of these functions does not attempt to change the value of the arguments constified, and it removes one unconstify() in basic_archive.c. Author: Nathan Bossart Reviewed-by: Andrew Dunstan, Peter Eisentraut Discussion: https://postgr.es/m/20230114231126.GA2580330@nathanxps13 --- contrib/basic_archive/basic_archive.c | 2 +- src/backend/storage/file/copydir.c | 4 ++-- src/include/storage/copydir.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/basic_archive/basic_archive.c b/contrib/basic_archive/basic_archive.c index 28cbb6cce0e..3d29711a316 100644 --- a/contrib/basic_archive/basic_archive.c +++ b/contrib/basic_archive/basic_archive.c @@ -275,7 +275,7 @@ basic_archive_file_internal(const char *file, const char *path) * Copy the file to its temporary destination. Note that this will fail * if temp already exists. */ - copy_file(unconstify(char *, path), temp); + copy_file(path, temp); /* * Sync the temporary file to disk and move it to its final destination. diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c index 7782e266772..e04bc3941ae 100644 --- a/src/backend/storage/file/copydir.c +++ b/src/backend/storage/file/copydir.c @@ -34,7 +34,7 @@ * a directory or a regular file is ignored. */ void -copydir(char *fromdir, char *todir, bool recurse) +copydir(const char *fromdir, const char *todir, bool recurse) { DIR *xldir; struct dirent *xlde; @@ -114,7 +114,7 @@ copydir(char *fromdir, char *todir, bool recurse) * copy one file */ void -copy_file(char *fromfile, char *tofile) +copy_file(const char *fromfile, const char *tofile) { char *buffer; int srcfd; diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h index 713b732da23..a8be5b21e0b 100644 --- a/src/include/storage/copydir.h +++ b/src/include/storage/copydir.h @@ -13,7 +13,7 @@ #ifndef COPYDIR_H #define COPYDIR_H -extern void copydir(char *fromdir, char *todir, bool recurse); -extern void copy_file(char *fromfile, char *tofile); +extern void copydir(const char *fromdir, const char *todir, bool recurse); +extern void copy_file(const char *fromfile, const char *tofile); #endif /* COPYDIR_H */