ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Implement unique_fd.ok()" am: c9ec95272c

Browse source 
am: 90fec0a0b4

Change-Id: Ibdce3680a5b5554fdceda1cd585ef2c5c775572c
This commit is contained in:
Tomasz Wasilczyk 2019-07-24 07:26:13 -07:00 • committed by android-build-merger
commit cefafca6e1
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
base/include/android-base/unique_fd.h
View file

@ -92,6 +92,8 @@ class unique_fd_impl final {
explicit unique_fd_impl(int fd) { reset(fd); } explicit unique_fd_impl(int fd) { reset(fd); }
~unique_fd_impl() { reset(); } ~unique_fd_impl() { reset(); }
unique_fd_impl(const unique_fd_impl&) = delete;
void operator=(const unique_fd_impl&) = delete;
unique_fd_impl(unique_fd_impl&& other) noexcept { reset(other.release()); } unique_fd_impl(unique_fd_impl&& other) noexcept { reset(other.release()); }
unique_fd_impl& operator=(unique_fd_impl&& s) noexcept { unique_fd_impl& operator=(unique_fd_impl&& s) noexcept {
int fd = s.fd_; int fd = s.fd_;
@ -118,6 +120,8 @@ class unique_fd_impl final {
// Catch bogus error checks (i.e.: "!fd" instead of "fd != -1"). // Catch bogus error checks (i.e.: "!fd" instead of "fd != -1").
bool operator!() const = delete; bool operator!() const = delete;
bool ok() const { return get() != -1; }
int release() __attribute__((warn_unused_result)) { int release() __attribute__((warn_unused_result)) {
tag(fd_, this, nullptr); tag(fd_, this, nullptr);
int ret = fd_; int ret = fd_;
@ -167,9 +171,6 @@ class unique_fd_impl final {
static auto close(int fd, void*) -> decltype(T::Close(fd), void()) { static auto close(int fd, void*) -> decltype(T::Close(fd), void()) {
T::Close(fd); T::Close(fd);
} }
unique_fd_impl(const unique_fd_impl&);
void operator=(const unique_fd_impl&);
}; };
using unique_fd = unique_fd_impl<DefaultCloser>; using unique_fd = unique_fd_impl<DefaultCloser>;