diff options
Diffstat (limited to 'zenstore/basicfile.cpp')
| -rw-r--r-- | zenstore/basicfile.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/zenstore/basicfile.cpp b/zenstore/basicfile.cpp index eb93638f2..f518e0491 100644 --- a/zenstore/basicfile.cpp +++ b/zenstore/basicfile.cpp @@ -29,7 +29,7 @@ BasicFile::~BasicFile() } void -BasicFile::Open(const std::filesystem::path& FileName, EMode Mode) +BasicFile::Open(const std::filesystem::path& FileName, Mode Mode) { std::error_code Ec; Open(FileName, Mode, Ec); @@ -41,7 +41,7 @@ BasicFile::Open(const std::filesystem::path& FileName, EMode Mode) } void -BasicFile::Open(const std::filesystem::path& FileName, EMode Mode, std::error_code& Ec) +BasicFile::Open(const std::filesystem::path& FileName, Mode Mode, std::error_code& Ec) { Ec.clear(); @@ -50,23 +50,23 @@ BasicFile::Open(const std::filesystem::path& FileName, EMode Mode, std::error_co DWORD dwDesiredAccess = 0; switch (Mode) { - case EMode::kRead: + case Mode::kRead: dwCreationDisposition |= OPEN_EXISTING; dwDesiredAccess |= GENERIC_READ; break; - case EMode::kWrite: + case Mode::kWrite: dwCreationDisposition |= OPEN_ALWAYS; dwDesiredAccess |= (GENERIC_READ | GENERIC_WRITE); break; - case EMode::kDelete: + case Mode::kDelete: dwCreationDisposition |= OPEN_ALWAYS; dwDesiredAccess |= (GENERIC_READ | GENERIC_WRITE | DELETE); break; - case EMode::kTruncate: + case Mode::kTruncate: dwCreationDisposition |= CREATE_ALWAYS; dwDesiredAccess |= (GENERIC_READ | GENERIC_WRITE); break; - case EMode::kTruncateDelete: + case Mode::kTruncateDelete: dwCreationDisposition |= CREATE_ALWAYS; dwDesiredAccess |= (GENERIC_READ | GENERIC_WRITE | DELETE); break; @@ -94,15 +94,15 @@ BasicFile::Open(const std::filesystem::path& FileName, EMode Mode, std::error_co int OpenFlags = O_CLOEXEC; switch (Mode) { - case EMode::kRead: + case Mode::kRead: OpenFlags |= O_RDONLY; break; - case EMode::kWrite: - case EMode::kDelete: + case Mode::kWrite: + case Mode::kDelete: OpenFlags |= (O_RDWR | O_CREAT); break; - case EMode::kTruncate: - case EMode::kTruncateDelete: + case Mode::kTruncate: + case Mode::kTruncateDelete: OpenFlags |= (O_RDWR | O_CREAT | O_TRUNC); break; } @@ -113,7 +113,7 @@ BasicFile::Open(const std::filesystem::path& FileName, EMode Mode, std::error_co Ec = zen::MakeErrorCodeFromLastError(); return; } - if (Mode != EMode::kRead) + if (Mode != Mode::kRead) { fchmod(Fd, 0666); } @@ -427,7 +427,7 @@ TemporaryFile::CreateTemporary(std::filesystem::path TempDirName, std::error_cod m_TempPath = TempDirName / TempName.c_str(); - Open(m_TempPath, BasicFile::EMode::kTruncateDelete, Ec); + Open(m_TempPath, BasicFile::Mode::kTruncateDelete, Ec); } void @@ -527,8 +527,8 @@ TEST_CASE("BasicFile") ScopedCurrentDirectoryChange _; BasicFile File1; - CHECK_THROWS(File1.Open("zonk", BasicFile::EMode::kRead)); - CHECK_NOTHROW(File1.Open("zonk", BasicFile::EMode::kTruncate)); + CHECK_THROWS(File1.Open("zonk", BasicFile::Mode::kRead)); + CHECK_NOTHROW(File1.Open("zonk", BasicFile::Mode::kTruncate)); CHECK_NOTHROW(File1.Write("abcd", 4, 0)); CHECK(File1.FileSize() == 4); { |