Use the simpler version of sys::fs::remove when possible.

llvm-svn: 198958
This commit is contained in:
Rafael Espindola 2014-01-10 21:40:29 +00:00
parent 2a008784d3
commit 81e7fd011f
5 changed files with 12 additions and 22 deletions

View File

@ -51,8 +51,7 @@ namespace llvm {
~FileRemover() {
if (DeleteIt) {
// Ignore problems deleting the file.
bool existed;
sys::fs::remove(Filename.str(), existed);
sys::fs::remove(Filename.str());
}
}
@ -62,8 +61,7 @@ namespace llvm {
void setFile(const Twine& filename, bool deleteIt = true) {
if (DeleteIt) {
// Ignore problems deleting the file.
bool existed;
sys::fs::remove(Filename.str(), existed);
sys::fs::remove(Filename.str());
}
Filename.clear();

View File

@ -28,8 +28,7 @@ FileOutputBuffer::FileOutputBuffer(mapped_file_region * R,
}
FileOutputBuffer::~FileOutputBuffer() {
bool Existed;
sys::fs::remove(Twine(TempPath), Existed);
sys::fs::remove(Twine(TempPath));
}
error_code FileOutputBuffer::create(StringRef FilePath,
@ -57,8 +56,7 @@ error_code FileOutputBuffer::create(StringRef FilePath,
}
// Delete target file.
bool Existed;
EC = sys::fs::remove(FilePath, Existed);
EC = sys::fs::remove(FilePath);
if (EC)
return EC;

View File

@ -87,8 +87,7 @@ ExecGraphViewer(StringRef ExecPath, std::vector<const char*> &args,
errs() << "Error: " << ErrMsg << "\n";
return false;
}
bool Existed;
sys::fs::remove(Filename, Existed);
sys::fs::remove(Filename);
errs() << " done. \n";
}
else {

View File

@ -111,8 +111,7 @@ LockFileManager::LockFileManager(StringRef FileName)
// We failed to write out PID, so make up an excuse, remove the
// unique lock file, and fail.
Error = make_error_code(errc::no_space_on_device);
bool Existed;
sys::fs::remove(UniqueLockFileName.c_str(), Existed);
sys::fs::remove(UniqueLockFileName.c_str());
return;
}
}
@ -137,14 +136,13 @@ LockFileManager::LockFileManager(StringRef FileName)
// Someone else managed to create the lock file first. Wipe out our unique
// lock file (it's useless now) and read the process ID from the lock file.
bool Existed;
sys::fs::remove(UniqueLockFileName.str(), Existed);
sys::fs::remove(UniqueLockFileName.str());
if ((Owner = readLockFile(LockFileName)))
return;
// There is a lock file that nobody owns; try to clean it up and report
// an error.
sys::fs::remove(LockFileName.str(), Existed);
sys::fs::remove(LockFileName.str());
Error = EC;
}
@ -163,9 +161,8 @@ LockFileManager::~LockFileManager() {
return;
// Since we own the lock, remove the lock file and our own unique lock file.
bool Existed;
sys::fs::remove(LockFileName.str(), Existed);
sys::fs::remove(UniqueLockFileName.str(), Existed);
sys::fs::remove(LockFileName.str());
sys::fs::remove(UniqueLockFileName.str());
}
void LockFileManager::waitForUnlock() {

View File

@ -25,10 +25,8 @@ tool_output_file::CleanupInstaller::CleanupInstaller(const char *filename)
tool_output_file::CleanupInstaller::~CleanupInstaller() {
// Delete the file if the client hasn't told us not to.
if (!Keep && Filename != "-") {
bool Existed;
sys::fs::remove(Filename, Existed);
}
if (!Keep && Filename != "-")
sys::fs::remove(Filename);
// Ok, the file is successfully written and closed, or deleted. There's no
// further need to clean it up on signals.