diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-01-11 17:03:59 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-01-11 17:03:59 +0900 |
| commit | 357e4b1a77132705432345e0f54ec50ab07a73ab (patch) | |
| tree | 616b7269d02e9f2435437fa4fdfa573ba8c032f0 /src/SocketCore.cc | |
| parent | 8ba0d58ee1a9fc2249839339549293ddc183fe66 (diff) | |
Made SocketCore::readData() and readDataFrom() take void*
Diffstat (limited to 'src/SocketCore.cc')
| -rw-r--r-- | src/SocketCore.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/SocketCore.cc b/src/SocketCore.cc index d8596009..e18ed912 100644 --- a/src/SocketCore.cc +++ b/src/SocketCore.cc @@ -825,14 +825,15 @@ ssize_t SocketCore::writeData(const void* data, size_t len) return ret; } -void SocketCore::readData(char* data, size_t& len) +void SocketCore::readData(void* data, size_t& len) { ssize_t ret = 0; wantRead_ = false; wantWrite_ = false; if(!secure_) { - while((ret = recv(sockfd_, data, len, 0)) == -1 && + // Cast for Windows recv() + while((ret = recv(sockfd_, reinterpret_cast<char*>(data), len, 0)) == -1 && SOCKET_ERRNO == A2_EINTR); int errNum = SOCKET_ERRNO; if(ret == -1) { @@ -1247,7 +1248,7 @@ ssize_t SocketCore::writeData(const void* data, size_t len, return r; } -ssize_t SocketCore::readDataFrom(char* data, size_t len, +ssize_t SocketCore::readDataFrom(void* data, size_t len, std::pair<std::string /* numerichost */, uint16_t /* port */>& sender) { @@ -1256,7 +1257,9 @@ ssize_t SocketCore::readDataFrom(char* data, size_t len, sockaddr_union sockaddr; socklen_t sockaddrlen = sizeof(sockaddr); ssize_t r; - while((r = recvfrom(sockfd_, data, len, 0, &sockaddr.sa, &sockaddrlen)) == -1 + // Cast for Windows recvfrom() + while((r = recvfrom(sockfd_, reinterpret_cast<char*>(data), len, 0, + &sockaddr.sa, &sockaddrlen)) == -1 && A2_EINTR == SOCKET_ERRNO); int errNum = SOCKET_ERRNO; if(r == -1) { |