bfVFS: fix usage in XMLWriter.cpp and XMLProperties.cpp

majcosta · Dec 15, 2024 · 18f4ac6 · 18f4ac6
1 parent f5da061
commit 18f4ac6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Utils/XMLProperties.cpp b/Utils/XMLProperties.cpp
@@ -182,12 +182,10 @@ bool vfs::PropertyContainer::initFromXMLFile(vfs::Path const& sFileName, vfs::Pr
 	}
 	else
 	{
-		vfs::File* rfile = new vfs::File(sFileName);
+		auto file{vfs::OpenReadFile(sFileName)};
 		delete_file = true;
-		file = vfs::ReadableFile_t::cast(rfile);
 		if(!file->openRead())
 		{
-			delete file;
 			return false;
 		}
 	}

diff --git a/Utils/XMLWriter.cpp b/Utils/XMLWriter.cpp
@@ -61,10 +61,10 @@ bool XMLWriter::writeToFile(vfs::Path const& sFileName)
 	catch(vfs::Exception& ex)
 	{
 		SGP_ERROR(ex.what());
-		vfs::File file(sFileName);
-		if(file.openWrite(true,true))
+		auto file{vfs::OpenWriteFile(sFileName)};
+		if(file->openWrite(true,true))
 		{
-			return writeToFile(vfs::WritableFile_t::cast(&file));
+			return writeToFile(file.file());
 		}
 	}
 	return false;