mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-12 13:38:21 +00:00
Final Changes For PR495:
This chagne just renames some sys::Path methods to ensure they are not misused. The Path documentation now divides methods into two dimensions: Path/Disk and accessor/mutator. Path accessors and mutators only operate on the Path object itself without making any disk accesses. Disk accessors and mutators will also access or modify the file system. Because of the potentially destructive nature of disk mutators, it was decided that all such methods should end in the work "Disk" to ensure the user recognizes that the change will occur on the file system. This patch makes that change. The method name changes are: makeReadable -> makeReadableOnDisk makeWriteable -> makeWriteableOnDisk makeExecutable -> makeExecutableOnDisk setStatusInfo -> setStatusInfoOnDisk createDirectory -> createDirectoryOnDisk createFile -> createFileOnDisk createTemporaryFile -> createTemporaryFileOnDisk destroy -> eraseFromDisk rename -> renamePathOnDisk These changes pass the Linux Deja Gnu tests. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22354 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -374,7 +374,7 @@ Archive::writeToDisk(bool CreateSymbolTable, bool TruncateNames, bool Compress){
|
||||
|
||||
// Create a temporary file to store the archive in
|
||||
sys::Path TmpArchive = archPath;
|
||||
TmpArchive.createTemporaryFile();
|
||||
TmpArchive.createTemporaryFileOnDisk();
|
||||
|
||||
// Make sure the temporary gets removed if we crash
|
||||
sys::RemoveFileOnSignal(TmpArchive);
|
||||
@ -450,17 +450,17 @@ Archive::writeToDisk(bool CreateSymbolTable, bool TruncateNames, bool Compress){
|
||||
// Close up shop
|
||||
FinalFile.close();
|
||||
arch.close();
|
||||
TmpArchive.destroy();
|
||||
TmpArchive.eraseFromDisk();
|
||||
|
||||
} else {
|
||||
// We don't have to insert the symbol table, so just renaming the temp
|
||||
// file to the correct name will suffice.
|
||||
TmpArchive.rename(archPath);
|
||||
TmpArchive.renamePathOnDisk(archPath);
|
||||
}
|
||||
} catch (...) {
|
||||
// Make sure we clean up.
|
||||
if (TmpArchive.exists())
|
||||
TmpArchive.destroy();
|
||||
TmpArchive.eraseFromDisk();
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user