diff options
| -rw-r--r-- | libs/binder/RpcSession.cpp | 3 | ||||
| -rw-r--r-- | libs/binder/RpcState.h | 21 | ||||
| -rw-r--r-- | libs/binder/include/binder/RpcServer.h | 2 | ||||
| -rw-r--r-- | libs/binder/include/binder/RpcSession.h | 10 | ||||
| -rw-r--r-- | libs/binder/include_tls/binder/RpcAuth.h | 2 |
5 files changed, 20 insertions, 18 deletions
diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp index 137411bc6b..53c9b78a7a 100644 --- a/libs/binder/RpcSession.cpp +++ b/libs/binder/RpcSession.cpp @@ -688,7 +688,8 @@ status_t RpcSession::addOutgoingConnection(std::unique_ptr<RpcTransport> rpcTran status_t status = OK; if (init) { - mRpcBinderState->sendConnectionInit(connection, sp<RpcSession>::fromExisting(this)); + status = + mRpcBinderState->sendConnectionInit(connection, sp<RpcSession>::fromExisting(this)); } { diff --git a/libs/binder/RpcState.h b/libs/binder/RpcState.h index 50de22bc29..dba0a43060 100644 --- a/libs/binder/RpcState.h +++ b/libs/binder/RpcState.h @@ -60,20 +60,21 @@ public: RpcState(); ~RpcState(); - status_t readNewSessionResponse(const sp<RpcSession::RpcConnection>& connection, - const sp<RpcSession>& session, uint32_t* version); - status_t sendConnectionInit(const sp<RpcSession::RpcConnection>& connection, - const sp<RpcSession>& session); - status_t readConnectionInit(const sp<RpcSession::RpcConnection>& connection, - const sp<RpcSession>& session); + [[nodiscard]] status_t readNewSessionResponse(const sp<RpcSession::RpcConnection>& connection, + const sp<RpcSession>& session, uint32_t* version); + [[nodiscard]] status_t sendConnectionInit(const sp<RpcSession::RpcConnection>& connection, + const sp<RpcSession>& session); + [[nodiscard]] status_t readConnectionInit(const sp<RpcSession::RpcConnection>& connection, + const sp<RpcSession>& session); // TODO(b/182940634): combine some special transactions into one "getServerInfo" call? sp<IBinder> getRootObject(const sp<RpcSession::RpcConnection>& connection, const sp<RpcSession>& session); - status_t getMaxThreads(const sp<RpcSession::RpcConnection>& connection, - const sp<RpcSession>& session, size_t* maxThreadsOut); - status_t getSessionId(const sp<RpcSession::RpcConnection>& connection, - const sp<RpcSession>& session, std::vector<uint8_t>* sessionIdOut); + [[nodiscard]] status_t getMaxThreads(const sp<RpcSession::RpcConnection>& connection, + const sp<RpcSession>& session, size_t* maxThreadsOut); + [[nodiscard]] status_t getSessionId(const sp<RpcSession::RpcConnection>& connection, + const sp<RpcSession>& session, + std::vector<uint8_t>* sessionIdOut); [[nodiscard]] status_t transact(const sp<RpcSession::RpcConnection>& connection, const sp<IBinder>& address, uint32_t code, const Parcel& data, diff --git a/libs/binder/include/binder/RpcServer.h b/libs/binder/include/binder/RpcServer.h index 04c6b592a8..338ef1889d 100644 --- a/libs/binder/include/binder/RpcServer.h +++ b/libs/binder/include/binder/RpcServer.h @@ -185,7 +185,7 @@ private: static void establishConnection(sp<RpcServer>&& server, base::unique_fd clientFd, const sockaddr_storage addr, socklen_t addrLen); - status_t setupSocketServer(const RpcSocketAddress& address); + [[nodiscard]] status_t setupSocketServer(const RpcSocketAddress& address); const std::unique_ptr<RpcTransportCtx> mCtx; bool mAgreedExperimental = false; diff --git a/libs/binder/include/binder/RpcSession.h b/libs/binder/include/binder/RpcSession.h index f9b733d509..107cef1bf5 100644 --- a/libs/binder/include/binder/RpcSession.h +++ b/libs/binder/include/binder/RpcSession.h @@ -140,7 +140,7 @@ public: * Query the other side of the session for the maximum number of threads * it supports (maximum number of concurrent non-nested synchronous transactions) */ - status_t getRemoteMaxThreads(size_t* maxThreads); + [[nodiscard]] status_t getRemoteMaxThreads(size_t* maxThreads); /** * See RpcTransportCtx::getCertificate @@ -220,7 +220,7 @@ private: bool allowNested = false; }; - status_t readId(); + [[nodiscard]] status_t readId(); // A thread joining a server must always call these functions in order, and // cleanup is only programmed once into join. These are in separate @@ -262,7 +262,7 @@ private: std::unique_ptr<RpcTransport> rpcTransport); [[nodiscard]] bool removeIncomingConnection(const sp<RpcConnection>& connection); - status_t initShutdownTrigger(); + [[nodiscard]] status_t initShutdownTrigger(); enum class ConnectionUse { CLIENT, @@ -273,8 +273,8 @@ private: // Object representing exclusive access to a connection. class ExclusiveConnection { public: - static status_t find(const sp<RpcSession>& session, ConnectionUse use, - ExclusiveConnection* connection); + [[nodiscard]] static status_t find(const sp<RpcSession>& session, ConnectionUse use, + ExclusiveConnection* connection); ~ExclusiveConnection(); const sp<RpcConnection>& get() { return mConnection; } diff --git a/libs/binder/include_tls/binder/RpcAuth.h b/libs/binder/include_tls/binder/RpcAuth.h index 4c2f296135..ab64828220 100644 --- a/libs/binder/include_tls/binder/RpcAuth.h +++ b/libs/binder/include_tls/binder/RpcAuth.h @@ -40,7 +40,7 @@ public: // - SSL_CTX_use_certificate // - SSL_CTX_set*_chain // - SSL_CTX_add0_chain_cert - virtual status_t configure(SSL_CTX* ctx) = 0; + [[nodiscard]] virtual status_t configure(SSL_CTX* ctx) = 0; }; } // namespace android |