Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c85b787 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Gerrit Code Review
Browse files

Merge "Use unique_fd::ok() instead of -1 comparison" into main

parents 7456c7e8 bfb13a88

libs/binder/FdTrigger.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,7 @@ bool FdTrigger::isTriggered() { 
#ifdef BINDER_RPC_SINGLE_THREADED

#ifdef BINDER_RPC_SINGLE_THREADED

    return mTriggered;

    return mTriggered;

#else

#else

    return mWrite == -1;

    return !mWrite.ok();

#endif

#endif

}

}

libs/binder/RpcServer.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -168,7 +168,7 @@ void RpcServer::setConnectionFilter(std::function<bool(const void*, size_t)>&& f 




void RpcServer::setServerSocketModifier(std::function<void(base::borrowed_fd)>&& modifier) {

void RpcServer::setServerSocketModifier(std::function<void(base::borrowed_fd)>&& modifier) {

    RpcMutexLockGuard _l(mLock);

    RpcMutexLockGuard _l(mLock);

    LOG_ALWAYS_FATAL_IF(mServer.fd != -1, "Already started");

    LOG_ALWAYS_FATAL_IF(mServer.fd.ok(), "Already started");

    mServerSocketModifier = std::move(modifier);

    mServerSocketModifier = std::move(modifier);

}

}
@@ -200,7 +200,7 @@ void RpcServer::start() { 
status_t RpcServer::acceptSocketConnection(const RpcServer& server, RpcTransportFd* out) {

status_t RpcServer::acceptSocketConnection(const RpcServer& server, RpcTransportFd* out) {

    RpcTransportFd clientSocket(unique_fd(TEMP_FAILURE_RETRY(

    RpcTransportFd clientSocket(unique_fd(TEMP_FAILURE_RETRY(

            accept4(server.mServer.fd.get(), nullptr, nullptr, SOCK_CLOEXEC | SOCK_NONBLOCK))));

            accept4(server.mServer.fd.get(), nullptr, nullptr, SOCK_CLOEXEC | SOCK_NONBLOCK))));

    if (clientSocket.fd < 0) {

    if (!clientSocket.fd.ok()) {

        int savedErrno = errno;

        int savedErrno = errno;

        ALOGE("Could not accept4 socket: %s", strerror(savedErrno));

        ALOGE("Could not accept4 socket: %s", strerror(savedErrno));

        return -savedErrno;

        return -savedErrno;

libs/binder/RpcSession.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -208,7 +208,7 @@ status_t RpcSession::addNullDebuggingClient() { 




    unique_fd serverFd(TEMP_FAILURE_RETRY(open("/dev/null", O_WRONLY | O_CLOEXEC)));

    unique_fd serverFd(TEMP_FAILURE_RETRY(open("/dev/null", O_WRONLY | O_CLOEXEC)));





    if (serverFd == -1) {

    if (!serverFd.ok()) {

        int savedErrno = errno;

        int savedErrno = errno;

        ALOGE("Could not connect to /dev/null: %s", strerror(savedErrno));

        ALOGE("Could not connect to /dev/null: %s", strerror(savedErrno));

        return -savedErrno;

        return -savedErrno;
@@ -594,7 +594,7 @@ status_t RpcSession::setupOneSocketConnection(const RpcSocketAddress& addr, 




        unique_fd serverFd(TEMP_FAILURE_RETRY(

        unique_fd serverFd(TEMP_FAILURE_RETRY(

                socket(addr.addr()->sa_family, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)));

                socket(addr.addr()->sa_family, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)));

        if (serverFd == -1) {

        if (!serverFd.ok()) {

            int savedErrno = errno;

            int savedErrno = errno;

            ALOGE("Could not create socket at %s: %s", addr.toString().c_str(),

            ALOGE("Could not create socket at %s: %s", addr.toString().c_str(),

                  strerror(savedErrno));

                  strerror(savedErrno));

libs/binder/tests/binderRpcTest.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -1159,7 +1159,7 @@ bool testSupportVsockLoopback() { 
        return false;

        return false;

    }

    }





    LOG_ALWAYS_FATAL_IF(serverFd == -1, "Could not create socket: %s", strerror(errno));

    LOG_ALWAYS_FATAL_IF(!serverFd.ok(), "Could not create socket: %s", strerror(errno));





    sockaddr_vm serverAddr{

    sockaddr_vm serverAddr{

            .svm_family = AF_VSOCK,

            .svm_family = AF_VSOCK,
@@ -1181,7 +1181,7 @@ bool testSupportVsockLoopback() { 
    // and they return ETIMEDOUT after that.

    // and they return ETIMEDOUT after that.

    android::base::unique_fd connectFd(

    android::base::unique_fd connectFd(

            TEMP_FAILURE_RETRY(socket(AF_VSOCK, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)));

            TEMP_FAILURE_RETRY(socket(AF_VSOCK, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0)));

    LOG_ALWAYS_FATAL_IF(connectFd == -1, "Could not create socket for port %u: %s", vsockPort,

    LOG_ALWAYS_FATAL_IF(!connectFd.ok(), "Could not create socket for port %u: %s", vsockPort,

                        strerror(errno));

                        strerror(errno));





    bool success = false;

    bool success = false;