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

io/FileOutputStream: simplify OpenTempFile() call

This commit is contained in:
Max Kellermann 2022-05-13 13:21:01 +02:00
parent bd3e096411
commit 2670bbdcc8
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/io/FileOutputStream.cxx
View File

@ -190,28 +190,26 @@ OpenTempFile(FileDescriptor directory_fd,
#endif /* HAVE_O_TMPFILE */ #endif /* HAVE_O_TMPFILE */
inline void inline void
FileOutputStream::OpenCreate(bool visible) FileOutputStream::OpenCreate([[maybe_unused]] bool visible)
{ {
#ifdef HAVE_O_TMPFILE #ifdef HAVE_O_TMPFILE
/* try Linux's O_TMPFILE first */ /* try Linux's O_TMPFILE first */
is_tmpfile = !visible && OpenTempFile(directory_fd, fd, GetPath()); if (!visible && OpenTempFile(directory_fd, fd, GetPath())) {
if (!is_tmpfile) { is_tmpfile = true;
#endif return;
/* fall back to plain POSIX */
if (!fd.Open(
#ifdef __linux__
directory_fd,
#endif
GetPath().c_str(),
O_WRONLY|O_CREAT|O_TRUNC,
0666))
throw FormatErrno("Failed to create %s",
GetPath().c_str());
#ifdef HAVE_O_TMPFILE
} }
#else
(void)visible;
#endif #endif
/* fall back to plain POSIX */
if (!fd.Open(
#ifdef __linux__
directory_fd,
#endif
GetPath().c_str(),
O_WRONLY|O_CREAT|O_TRUNC,
0666))
throw FormatErrno("Failed to create %s",
GetPath().c_str());
} }
inline void inline void