diff options
author | 2022-10-24 23:06:14 +0100 | |
---|---|---|
committer | 2022-10-25 20:52:39 +0100 | |
commit | c3964f68e251e3a80f952e2014b2b5dc738aff4c (patch) | |
tree | 34d96aa4018f0bf347803cace44b9a0ec0ddd0e5 /libs | |
parent | 77f3da77c9aa5d7bb504ee72da5a21314f28eb9e (diff) |
Fix return types of sendMessageOnSocket/receiveMessageFromSocket
recvmsg() and sendmsg() return ssize_t but the wrapper functions
returned int. Fix the return type.
Bug: 250685929
Test: atest rpcBinderTest
Change-Id: Ia3f7f58e286f24a8711aed97d9bc2b3cf6b78f0d
Diffstat (limited to 'libs')
-rw-r--r-- | libs/binder/OS.cpp | 4 | ||||
-rw-r--r-- | libs/binder/OS.h | 4 | ||||
-rw-r--r-- | libs/binder/RpcTransportRaw.cpp | 3 | ||||
-rw-r--r-- | libs/binder/trusty/OS.cpp | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/libs/binder/OS.cpp b/libs/binder/OS.cpp index 77e401f83e..ce60e33ba7 100644 --- a/libs/binder/OS.cpp +++ b/libs/binder/OS.cpp @@ -67,7 +67,7 @@ std::unique_ptr<RpcTransportCtxFactory> makeDefaultRpcTransportCtxFactory() { return RpcTransportCtxFactoryRaw::make(); } -int sendMessageOnSocket( +ssize_t sendMessageOnSocket( const RpcTransportFd& socket, iovec* iovs, int niovs, const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds) { if (ancillaryFds != nullptr && !ancillaryFds->empty()) { @@ -112,7 +112,7 @@ int sendMessageOnSocket( return TEMP_FAILURE_RETRY(sendmsg(socket.fd.get(), &msg, MSG_NOSIGNAL)); } -int receiveMessageFromSocket( +ssize_t receiveMessageFromSocket( const RpcTransportFd& socket, iovec* iovs, int niovs, std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds) { if (ancillaryFds != nullptr) { diff --git a/libs/binder/OS.h b/libs/binder/OS.h index 0d38968ade..fecae31763 100644 --- a/libs/binder/OS.h +++ b/libs/binder/OS.h @@ -33,11 +33,11 @@ status_t dupFileDescriptor(int oldFd, int* newFd); std::unique_ptr<RpcTransportCtxFactory> makeDefaultRpcTransportCtxFactory(); -int sendMessageOnSocket( +ssize_t sendMessageOnSocket( const RpcTransportFd& socket, iovec* iovs, int niovs, const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds); -int receiveMessageFromSocket( +ssize_t receiveMessageFromSocket( const RpcTransportFd& socket, iovec* iovs, int niovs, std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds); diff --git a/libs/binder/RpcTransportRaw.cpp b/libs/binder/RpcTransportRaw.cpp index 1912d140f4..cd067bfee7 100644 --- a/libs/binder/RpcTransportRaw.cpp +++ b/libs/binder/RpcTransportRaw.cpp @@ -61,7 +61,8 @@ public: override { bool sentFds = false; auto send = [&](iovec* iovs, int niovs) -> ssize_t { - int ret = sendMessageOnSocket(mSocket, iovs, niovs, sentFds ? nullptr : ancillaryFds); + ssize_t ret = + sendMessageOnSocket(mSocket, iovs, niovs, sentFds ? nullptr : ancillaryFds); sentFds |= ret > 0; return ret; }; diff --git a/libs/binder/trusty/OS.cpp b/libs/binder/trusty/OS.cpp index 397ff41d58..8ec982345d 100644 --- a/libs/binder/trusty/OS.cpp +++ b/libs/binder/trusty/OS.cpp @@ -59,14 +59,14 @@ std::unique_ptr<RpcTransportCtxFactory> makeDefaultRpcTransportCtxFactory() { return RpcTransportCtxFactoryTipcTrusty::make(); } -int sendMessageOnSocket( +ssize_t sendMessageOnSocket( const RpcTransportFd& /* socket */, iovec* /* iovs */, int /* niovs */, const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* /* ancillaryFds */) { errno = ENOTSUP; return -1; } -int receiveMessageFromSocket( +ssize_t receiveMessageFromSocket( const RpcTransportFd& /* socket */, iovec* /* iovs */, int /* niovs */, std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* /* ancillaryFds */) { errno = ENOTSUP; |