Use non-throwing remove() and rename() in MultiPage and CacheFile

Author: agruzdev

Source/FreeImage/CacheFile.cpp

@@ -83,7 +83,8 @@ CacheFile::close() {
 		m_file = nullptr;
 
 		// delete the file
-		std::filesystem::remove(m_filename);
+		std::error_code err{};
+		std::filesystem::remove(m_filename, err);
 	}
 }
 

Source/FreeImage/MultiPage.cpp

@@ -518,10 +518,10 @@ FreeImage_CloseMultiBitmap(FIMULTIBITMAP *bitmap, int flags) {
 					// applies changes to the destination file
 
 					if (success) {
-						std::filesystem::remove(header->m_filename);
-						std::filesystem::rename(spool_name, header->m_filename);
+						success = MoveOrCopy(spool_name, header->m_filename);
 					} else {
-						std::filesystem::remove(spool_name);
+						std::error_code err{};
+						std::filesystem::remove(spool_name, err);
 					}
 				} catch (std::exception& err) {
 					FreeImage_OutputMessageProc(header->fif, "Exception: %s", err.what());

Source/FreeImage/Plugin.cpp

@@ -802,21 +802,6 @@ namespace {
 	}
 
 
-	bool MoveOrCopy(const std::filesystem::path& oldp, const std::filesystem::path& newp) noexcept
-	{
-		std::error_code err{};
-		std::filesystem::rename(oldp, newp, err);
-		if (!err) {
-			return true;
-		}
-		const auto copied = std::filesystem::copy_file(oldp, newp, std::filesystem::copy_options::overwrite_existing, err);
-		if (copied) {
-			std::filesystem::remove(oldp, err);
-		}
-		return copied;
-	}
-
-
 	FIBOOL SaveImpl(FREE_IMAGE_FORMAT fif, FIBITMAP* dib, const std::filesystem::path& filename, int flags) 
 	try
 	{

Source/Utilities.h

@@ -88,6 +88,22 @@ FILE* FreeImage_FOpen(const std::filesystem::path& filename, const std::filesyst
 }
 
 
+inline
+bool MoveOrCopy(const std::filesystem::path& oldp, const std::filesystem::path& newp) noexcept
+{
+	std::error_code err{};
+	std::filesystem::rename(oldp, newp, err);
+	if (!err) {
+		return true;
+	}
+	const auto copied = std::filesystem::copy_file(oldp, newp, std::filesystem::copy_options::overwrite_existing, err);
+	if (copied) {
+		std::filesystem::remove(oldp, err);
+	}
+	return copied;
+}
+
+
 // these structs are for file I/O and should not be confused with similar
 // structs in FreeImage.h which are for in-memory bitmap handling