diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-11-15 08:24:20 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-11-15 08:24:20 +0100 |
| commit | 1ced32aaad9731c1fc14e232dc6463159b3d48d5 (patch) | |
| tree | 6cafbc5c62c564dfe7a0d27c2f6254c3485c2264 /cpp/src/Ice/StreamSocket.cpp | |
| parent | Set slice output to avoid warning with Android Studio (diff) | |
| download | ice-1ced32aaad9731c1fc14e232dc6463159b3d48d5.tar.bz2 ice-1ced32aaad9731c1fc14e232dc6463159b3d48d5.tar.xz ice-1ced32aaad9731c1fc14e232dc6463159b3d48d5.zip | |
Fixed SOCKET_ERROR assignement with DWORD, fixes #267
Diffstat (limited to 'cpp/src/Ice/StreamSocket.cpp')
| -rwxr-xr-x | cpp/src/Ice/StreamSocket.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cpp/src/Ice/StreamSocket.cpp b/cpp/src/Ice/StreamSocket.cpp index 6067670d20d..a39d0c4ae66 100755 --- a/cpp/src/Ice/StreamSocket.cpp +++ b/cpp/src/Ice/StreamSocket.cpp @@ -92,7 +92,7 @@ StreamSocket::connect(Buffer& readBuffer, Buffer& writeBuffer) #if defined(ICE_USE_IOCP) doFinishConnectAsync(_fd, _write); #elif defined(ICE_OS_UWP) - if(_write.count == SOCKET_ERROR) + if(_write.error != ERROR_SUCCESS) { try { @@ -389,6 +389,7 @@ StreamSocket::startWrite(Buffer& buf) _write.buf.len = static_cast<DWORD>(packetSize); _write.buf.buf = reinterpret_cast<char*>(&*buf.i); + _write.error = ERROR_SUCCESS; int err = WSASend(_fd, &_write.buf, 1, &_write.count, 0, &_write, ICE_NULLPTR); if(err == SOCKET_ERROR) { @@ -415,7 +416,7 @@ StreamSocket::finishWrite(Buffer& buf) return; } - if(static_cast<int>(_write.count) == SOCKET_ERROR) + if(_write.error != ERROR_SUCCESS) { WSASetLastError(_write.error); if(connectionLost()) @@ -444,6 +445,7 @@ StreamSocket::startRead(Buffer& buf) size_t packetSize = getRecvPacketSize(length); _read.buf.len = static_cast<DWORD>(packetSize); _read.buf.buf = reinterpret_cast<char*>(&*buf.i); + _read.error = ERROR_SUCCESS; int err = WSARecv(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_read, ICE_NULLPTR); if(err == SOCKET_ERROR) { @@ -469,7 +471,7 @@ StreamSocket::finishRead(Buffer& buf) return; } - if(static_cast<int>(_read.count) == SOCKET_ERROR) + if(_read.error != ERROR_SUCCESS) { WSASetLastError(_read.error); if(connectionLost()) @@ -554,7 +556,7 @@ StreamSocket::finishWrite(Buffer& buf) return; } - if(_write.count == SOCKET_ERROR) + if(_write.error != ERROR_SUCCESS) { checkErrorCode(__FILE__, __LINE__, _write.error); } @@ -586,7 +588,7 @@ StreamSocket::finishRead(Buffer& buf) return; } - if(_read.count == SOCKET_ERROR) + if(_read.error != ERROR_SUCCESS) { checkErrorCode(__FILE__, __LINE__, _read.error); } |