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

fs/io/FileOutputStream: fix wrong #ifdef WIN32

This commit is contained in:
Max Kellermann 2015-03-25 17:28:27 +01:00
parent 69ad5671ed
commit cfd26f53f0
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/fs/io/FileOutputStream.cxx
View File

@ -214,32 +214,16 @@ FileOutputStream::Cancel()
RemoveFile(GetPath()); RemoveFile(GetPath());
} }
#ifdef WIN32 #endif
FileOutputStream::FileOutputStream(Path _path, Error &error)
:path(_path),
handle(CreateFile(path.c_str(), GENERIC_WRITE, 0, nullptr,
CREATE_ALWAYS,
FILE_ATTRIBUTE_NORMAL|FILE_FLAG_WRITE_THROUGH,
nullptr))
{
if (handle == INVALID_HANDLE_VALUE) {
const auto path_utf8 = path.ToUTF8();
error.FormatLastError("Failed to create %s",
path_utf8.c_str());
}
}
#else
AppendFileOutputStream::AppendFileOutputStream(Path _path, Error &error) AppendFileOutputStream::AppendFileOutputStream(Path _path, Error &error)
:BaseFileOutputStream(_path) :BaseFileOutputStream(_path)
{ {
#ifdef WIN32 #ifdef WIN32
SetHandle(CreateFile(path.c_str(), GENERIC_WRITE, 0, nullptr, SetHandle(CreateFile(GetPath().c_str(), GENERIC_WRITE, 0, nullptr,
OPEN_EXISTING, OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL|FILE_FLAG_WRITE_THROUGH, FILE_ATTRIBUTE_NORMAL|FILE_FLAG_WRITE_THROUGH,
nullptr)) nullptr));
if (!IsDefined()) if (!IsDefined())
error.FormatLastError("Failed to append to %s", error.FormatLastError("Failed to append to %s",
GetPath().ToUTF8().c_str()); GetPath().ToUTF8().c_str());
@ -257,8 +241,6 @@ AppendFileOutputStream::AppendFileOutputStream(Path _path, Error &error)
#endif #endif
} }
#endif
bool bool
AppendFileOutputStream::Commit(gcc_unused Error &error) AppendFileOutputStream::Commit(gcc_unused Error &error)
{ {
@ -274,5 +256,3 @@ AppendFileOutputStream::Commit(gcc_unused Error &error)
return success; return success;
#endif #endif
} }
#endif