From 306424f589505bc6fa263513ef98b845600edd0b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 4 Aug 2022 20:13:43 -0700 Subject: [PATCH] remove c_str for fs stuff fs::path is convertable to a string. Signed-off-by: Rosen Penev --- src/basicio.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/basicio.cpp b/src/basicio.cpp index cb9427ca..eedbb5c6 100644 --- a/src/basicio.cpp +++ b/src/basicio.cpp @@ -335,7 +335,7 @@ void FileIo::transfer(BasicIo& src) { // Check if the file can be written to, if it already exists if (open("a+b") != 0) { // Remove the (temporary) file - fs::remove(fileIo->path().c_str()); + fs::remove(fileIo->path()); throw Error(ErrorCode::kerFileOpenFailed, path(), "a+b", strError()); } close(); @@ -366,8 +366,8 @@ void FileIo::transfer(BasicIo& src) { pfcn_ReplaceFileA(pf, fileIo->path().c_str(), nullptr, REPLACEFILE_IGNORE_MERGE_ERRORS, nullptr, nullptr); if (ret == 0) { if (GetLastError() == ERROR_FILE_NOT_FOUND) { - fs::rename(fileIo->path().c_str(), pf); - fs::remove(fileIo->path().c_str()); + fs::rename(fileIo->path(), pf); + fs::remove(fileIo->path()); } else { throw Error(ErrorCode::kerFileRenameFailed, fileIo->path(), pf, strError()); } @@ -376,16 +376,16 @@ void FileIo::transfer(BasicIo& src) { if (fileExists(pf) && ::remove(pf) != 0) { throw Error(ErrorCode::kerCallFailed, pf, strError(), "fs::remove"); } - fs::rename(fileIo->path().c_str(), pf); - fs::remove(fileIo->path().c_str()); + fs::rename(fileIo->path(), pf); + fs::remove(fileIo->path()); } } #else if (fileExists(pf) && fs::remove(pf) != 0) { throw Error(ErrorCode::kerCallFailed, pf, strError(), "fs::remove"); } - fs::rename(fileIo->path().c_str(), pf); - fs::remove(fileIo->path().c_str()); + fs::rename(fileIo->path(), pf); + fs::remove(fileIo->path()); #endif // Check permissions of new file struct stat buf2;