From 2ef2bea64aa235d172daaefc5e5776d6b4f51288 Mon Sep 17 00:00:00 2001 From: Changgyu Choi Date: Mon, 17 Oct 2022 13:14:44 +0900 Subject: [PATCH] Fix static analysis issues Change-Id: I443f2472f98001c1b279cc27d835dc341024e846 Signed-off-by: Changgyu Choi --- src/client-socket-internal.cc | 8 ++++---- src/peer-cred-internal.cc | 2 +- src/rpc-port-parcel.cc | 4 ++-- src/server-socket-internal.cc | 2 +- utils/debug-port.cc | 4 ++-- utils/message.cc | 3 ++- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/client-socket-internal.cc b/src/client-socket-internal.cc index 4fbb344..c932342 100644 --- a/src/client-socket-internal.cc +++ b/src/client-socket-internal.cc @@ -62,7 +62,7 @@ int ClientSocket::Connect(const std::string& endpoint) { snprintf(sockaddr.sun_path, sizeof(sockaddr.sun_path), "%s", endpoint.c_str()); struct sockaddr* sockaddr_ptr = reinterpret_cast(&sockaddr); - socklen_t len = sizeof(sockaddr); + socklen_t len = static_cast(sizeof(sockaddr)); int ret = connect(GetFd(), sockaddr_ptr, len); fcntl(GetFd(), F_SETFL, flag); if (ret < 0) { @@ -142,7 +142,7 @@ int ClientSocket::GetSendBufferSize() { int ClientSocket::GetReceiveTimeout() { struct timeval timeout = { 0, }; - socklen_t len = sizeof(struct timeval); + socklen_t len = static_cast(sizeof(struct timeval)); int ret = getsockopt(GetFd(), SOL_SOCKET, SO_RCVTIMEO, reinterpret_cast(&timeout), &len); if (ret < 0) { @@ -156,7 +156,7 @@ int ClientSocket::GetReceiveTimeout() { } void ClientSocket::SetReceiveBufferSize(int size) { - socklen_t len = sizeof(size); + socklen_t len = static_cast(sizeof(size)); int ret = setsockopt(GetFd(), SOL_SOCKET, SO_RCVBUF, &size, len); if (ret < 0) { ret = -errno; @@ -191,7 +191,7 @@ void ClientSocket::SetReceiveTimeout(int timeout) { .tv_sec = static_cast(timeout / 1000), .tv_usec = static_cast((timeout % 1000) * 1000) }; - socklen_t len = sizeof(struct timeval); + socklen_t len = static_cast(sizeof(struct timeval)); int ret = setsockopt(GetFd(), SOL_SOCKET, SO_RCVTIMEO, &tv, len); if (ret < 0) { ret = -errno; diff --git a/src/peer-cred-internal.cc b/src/peer-cred-internal.cc index eebc131..e978e0f 100644 --- a/src/peer-cred-internal.cc +++ b/src/peer-cred-internal.cc @@ -31,7 +31,7 @@ PeerCred::PeerCred(pid_t pid, uid_t uid, gid_t gid) PeerCred* PeerCred::Get(int fd) { struct ucred cred; - socklen_t len = sizeof(struct ucred); + socklen_t len = static_cast(sizeof(struct ucred)); int ret = getsockopt(fd, SOL_SOCKET, SO_PEERCRED, static_cast(&cred), &len); if (ret != 0) { diff --git a/src/rpc-port-parcel.cc b/src/rpc-port-parcel.cc index 12782ee..098a53a 100644 --- a/src/rpc-port-parcel.cc +++ b/src/rpc-port-parcel.cc @@ -96,7 +96,7 @@ RPC_API int rpc_port_parcel_send(rpc_port_parcel_h h, rpc_port_h port) { tizen_base::Parcel raw_parcel; raw_parcel.WriteParcelable(*parcel); void* raw = reinterpret_cast(raw_parcel.GetData()); - uint32_t len = raw_parcel.GetDataSize(); + uint32_t len = static_cast(raw_parcel.GetDataSize()); if (len <= 0) return RPC_PORT_ERROR_INVALID_PARAMETER; @@ -418,7 +418,7 @@ RPC_API int rpc_port_parcel_to_array(rpc_port_parcel_h h, void** array, tizen_base::Parcel raw_parcel; raw_parcel.WriteParcelable(*parcel); void* raw = raw_parcel.GetData(); - uint32_t raw_size = raw_parcel.GetDataSize();; + size_t raw_size = raw_parcel.GetDataSize(); if (raw_size == 0) { _E("raw_size is zero"); return RPC_PORT_ERROR_IO_ERROR; diff --git a/src/server-socket-internal.cc b/src/server-socket-internal.cc index 228e75b..4f60c20 100644 --- a/src/server-socket-internal.cc +++ b/src/server-socket-internal.cc @@ -42,7 +42,7 @@ bool ServerSocket::IsClosed() { ClientSocket* ServerSocket::Accept() { struct sockaddr_un addr = { 0, }; - socklen_t len = sizeof(struct sockaddr_un); + socklen_t len = static_cast(sizeof(struct sockaddr_un)); auto* addr_ptr = reinterpret_cast(&addr); int client_fd = accept(GetFd(), addr_ptr, &len); if (client_fd == -1) { diff --git a/utils/debug-port.cc b/utils/debug-port.cc index b1c5fc7..08a80ea 100644 --- a/utils/debug-port.cc +++ b/utils/debug-port.cc @@ -219,7 +219,7 @@ void DebugPort::Unwatch() { int DebugPort::Accept(struct ucred* cred) { struct sockaddr_un addr = { 0, }; - socklen_t socklen = sizeof(addr); + socklen_t socklen = static_cast(sizeof(addr)); int client_fd = accept(fd_, reinterpret_cast(&addr), &socklen); if (client_fd < 0) { @@ -227,7 +227,7 @@ int DebugPort::Accept(struct ucred* cred) { return -1; } - socklen = sizeof(struct ucred); + socklen = static_cast(sizeof(struct ucred)); int ret = getsockopt(client_fd, SOL_SOCKET, SO_PEERCRED, cred, &socklen); if (ret < 0) { diff --git a/utils/message.cc b/utils/message.cc index c4145bc..e62bd3e 100644 --- a/utils/message.cc +++ b/utils/message.cc @@ -69,7 +69,8 @@ void Message::Hexdump() { break; std::cout << std::setw(8) << address; - nread = ((data_.size() - address) > 16) ? 16 : (data_.size() - address); + nread = static_cast( + ((data_.size() - address) > 16) ? 16 : (data_.size() - address)); for (unsigned int i = 0; i < 16; ++i) { if (i % 8 == 0) -- 2.7.4