diff options
| author | 2023-11-15 05:38:13 +0000 | |
|---|---|---|
| committer | 2023-11-15 05:38:13 +0000 | |
| commit | 1c85b787c76eb846199d8dc8b1b8ba483429af4c (patch) | |
| tree | 3da7d7ec1bb9048b8e3f38fef340de508b5b2c89 /libs/binder/RpcSession.cpp | |
| parent | 7456c7e8d93fbf8ac1c2baba7d1533f056d630d6 (diff) | |
| parent | bfb13a8860abce921e6fe832e9fc06d1ec58d5c4 (diff) | |
Merge "Use unique_fd::ok() instead of -1 comparison" into main
Diffstat (limited to 'libs/binder/RpcSession.cpp')
| -rw-r--r-- | libs/binder/RpcSession.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp index c895b21f91..cd8f41711f 100644 --- a/libs/binder/RpcSession.cpp +++ b/libs/binder/RpcSession.cpp @@ -208,7 +208,7 @@ status_t RpcSession::addNullDebuggingClient() { unique_fd serverFd(TEMP_FAILURE_RETRY(open("/dev/null", O_WRONLY | O_CLOEXEC))); - if (serverFd == -1) { + if (!serverFd.ok()) { int savedErrno = errno; ALOGE("Could not connect to /dev/null: %s", strerror(savedErrno)); return -savedErrno; @@ -594,7 +594,7 @@ status_t RpcSession::setupOneSocketConnection(const RpcSocketAddress& addr, unique_fd serverFd(TEMP_FAILURE_RETRY( socket(addr.addr()->sa_family, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0))); - if (serverFd == -1) { + if (!serverFd.ok()) { int savedErrno = errno; ALOGE("Could not create socket at %s: %s", addr.toString().c_str(), strerror(savedErrno)); |