diff options
Diffstat (limited to 'libs/pbd')
| -rw-r--r-- | libs/pbd/crossthread.cc | 2 | ||||
| -rw-r--r-- | libs/pbd/file_manager.cc | 3 | ||||
| -rw-r--r-- | libs/pbd/sndfile_manager.cc | 11 |
3 files changed, 1 insertions, 15 deletions
diff --git a/libs/pbd/crossthread.cc b/libs/pbd/crossthread.cc index aa9d2edcd2..2ffede5163 100644 --- a/libs/pbd/crossthread.cc +++ b/libs/pbd/crossthread.cc @@ -52,8 +52,6 @@ CrossThreadChannel::CrossThreadChannel (bool non_blocking) return; } } - fcntl(fds[0], F_SETFD, fcntl(fds[0], F_GETFD) | FD_CLOEXEC); - fcntl(fds[1], F_SETFD, fcntl(fds[1], F_GETFD) | FD_CLOEXEC); } CrossThreadChannel::~CrossThreadChannel () diff --git a/libs/pbd/file_manager.cc b/libs/pbd/file_manager.cc index fb3227a922..a71ffca190 100644 --- a/libs/pbd/file_manager.cc +++ b/libs/pbd/file_manager.cc @@ -289,9 +289,6 @@ StdioFileDescriptor::open () /* we must have a lock on the FileManager's mutex */ _file = fopen (_path.c_str(), _mode.c_str()); - if (_file) { - fcntl(fileno(_file), F_SETFD, fcntl(fileno(_file), F_GETFD) | FD_CLOEXEC); - } return (_file == 0); } diff --git a/libs/pbd/sndfile_manager.cc b/libs/pbd/sndfile_manager.cc index c3fbd7be5b..d1dcd05256 100644 --- a/libs/pbd/sndfile_manager.cc +++ b/libs/pbd/sndfile_manager.cc @@ -90,16 +90,7 @@ SndFileDescriptor::open () { /* we must have a lock on the FileManager's mutex */ - int fd = ::open(_path.c_str(), O_LARGEFILE | (_writeable ? (O_RDWR|O_CREAT) : O_RDONLY)); - if (fd == -1) return false; - fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); - - _sndfile = sf_open_fd (fd, _writeable ? SFM_RDWR : SFM_READ, _info, 1); - - if (sf_open_fd == 0) { - ::close(fd); - } - + _sndfile = sf_open (_path.c_str(), _writeable ? SFM_RDWR : SFM_READ, _info); return (_sndfile == 0); } |