oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/io/FileReader: use class UniqueFileDescriptor

Browse Source
This commit is contained in:
Max Kellermann 2018-08-21 18:23:43 +02:00
parent 84df470008
commit ab7597b089
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fs/io/FileReader.hxx
View File

@ -28,7 +28,7 @@
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#else #else
#include "system/FileDescriptor.hxx" #include "system/UniqueFileDescriptor.hxx"
#endif #endif
class Path; class Path;
@ -40,7 +40,7 @@ class FileReader final : public Reader {
#ifdef _WIN32 #ifdef _WIN32
HANDLE handle; HANDLE handle;
#else #else
FileDescriptor fd; UniqueFileDescriptor fd;
#endif #endif
public: public:
@ -50,18 +50,16 @@ public:
FileReader(FileReader &&other) noexcept FileReader(FileReader &&other) noexcept
:path(std::move(other.path)), :path(std::move(other.path)),
handle(std::exchange(other.handle, INVALID_HANDLE_VALUE)) {} handle(std::exchange(other.handle, INVALID_HANDLE_VALUE)) {}
#else
FileReader(FileReader &&other) noexcept
:path(std::move(other.path)),
fd(other.fd) {
other.fd.SetUndefined();
}
#endif
~FileReader() noexcept { ~FileReader() noexcept {
if (IsDefined()) if (IsDefined())
Close(); Close();
} }
#else
FileReader(FileReader &&other) noexcept
:path(std::move(other.path)),
fd(std::move(other.fd)) {}
#endif
protected: protected: