diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-04-09 17:30:16 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-04-09 17:30:16 -0700 |
| commit | eda865b483620345ae1ef039caf04150e1e2cca4 (patch) | |
| tree | 094e59c4f934589f5851dcbe25504990858819ac /src/core | |
| parent | 09d6e8cbc30e6f278415b2b06aa8617f638e6b86 (diff) | |
| parent | f3651a6573939741ec49245fc4c2a69f0a76fa92 (diff) | |
Merge pull request #14920 from yashykt/socklentcleanup
Cleanup from socklen_t changes
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/lib/iomgr/socket_utils_linux.cc | 1 | ||||
| -rw-r--r-- | src/core/lib/iomgr/socket_utils_posix.cc | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/core/lib/iomgr/socket_utils_linux.cc b/src/core/lib/iomgr/socket_utils_linux.cc index b0207578de..34f93cc4b0 100644 --- a/src/core/lib/iomgr/socket_utils_linux.cc +++ b/src/core/lib/iomgr/socket_utils_linux.cc @@ -33,7 +33,6 @@ int grpc_accept4(int sockfd, grpc_resolved_address* resolved_addr, int nonblock, int cloexec) { int flags = 0; - GPR_ASSERT(sizeof(socklen_t) <= sizeof(size_t)); flags |= nonblock ? SOCK_NONBLOCK : 0; flags |= cloexec ? SOCK_CLOEXEC : 0; return accept4(sockfd, reinterpret_cast<grpc_sockaddr*>(resolved_addr->addr), diff --git a/src/core/lib/iomgr/socket_utils_posix.cc b/src/core/lib/iomgr/socket_utils_posix.cc index 2a49583ac4..c48da52ffb 100644 --- a/src/core/lib/iomgr/socket_utils_posix.cc +++ b/src/core/lib/iomgr/socket_utils_posix.cc @@ -34,9 +34,8 @@ int grpc_accept4(int sockfd, grpc_resolved_address* resolved_addr, int nonblock, int cloexec) { int fd, flags; - GPR_ASSERT(sizeof(socklen_t) <= sizeof(size_t)); - fd = accept(sockfd, (grpc_sockaddr*)resolved_addr->addr, - (socklen_t*)&resolved_addr->len); + fd = accept(sockfd, reinterpret_cast<grpc_sockaddr*>(resolved_addr->addr), + &resolved_addr->len); if (fd >= 0) { if (nonblock) { flags = fcntl(fd, F_GETFL, 0); |