diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-09-04 01:36:08 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-09-04 01:36:08 +0000 |
| commit | 426a506afd1ffb3bd67e61b4693ee9bb968097a1 (patch) | |
| tree | a6a726552411a781e692de657e3a630fa8d65d65 /lib/server/SocketStream.cpp | |
| parent | 75ad60bcc4d33589bb5afb307a87fd19b220a9e8 (diff) | |
Simplify code with macros, update comments and fix whitespace.
Hopefully all of these changes are inconsequential.
Merged back changes from the test refactor branch to reduce diffs.
Diffstat (limited to 'lib/server/SocketStream.cpp')
| -rw-r--r-- | lib/server/SocketStream.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/lib/server/SocketStream.cpp b/lib/server/SocketStream.cpp index db71227f..ab0a54ae 100644 --- a/lib/server/SocketStream.cpp +++ b/lib/server/SocketStream.cpp @@ -323,15 +323,15 @@ bool SocketStream::Poll(short Events, int Timeout) // -------------------------------------------------------------------------- void SocketStream::Write(const void *pBuffer, int NBytes, int Timeout) { - if(mSocketHandle == INVALID_SOCKET_VALUE) + if(mSocketHandle == INVALID_SOCKET_VALUE) { THROW_EXCEPTION(ServerException, BadSocketHandle) } - + // Buffer in byte sized type. ASSERT(sizeof(char) == 1); const char *buffer = (char *)pBuffer; - + // Bytes left to send int bytesLeft = NBytes; box_time_t start = GetCurrentBoxTime(); @@ -348,22 +348,21 @@ void SocketStream::Write(const void *pBuffer, int NBytes, int Timeout) { // Error. mWriteClosed = true; // assume can't write again - BOX_LOG_SYS_ERROR("Failed to write to socket"); - THROW_EXCEPTION(ConnectionException, - SocketWriteError); + THROW_SYS_ERROR("Failed to write to socket", + ConnectionException, SocketWriteError); } - + // Knock off bytes sent bytesLeft -= sent; // Move buffer pointer buffer += sent; mBytesWritten += sent; - + // Need to wait until it can send again? if(bytesLeft > 0) { - BOX_TRACE("Waiting to send data on socket " << + BOX_TRACE("Waiting to send data on socket " << mSocketHandle << " (" << bytesLeft << " of " << NBytes << " bytes left)"); @@ -388,7 +387,7 @@ void SocketStream::Write(const void *pBuffer, int NBytes, int Timeout) // -------------------------------------------------------------------------- void SocketStream::Close() { - if(mSocketHandle == INVALID_SOCKET_VALUE) + if(mSocketHandle == INVALID_SOCKET_VALUE) { THROW_EXCEPTION(ServerException, BadSocketHandle) } @@ -419,14 +418,14 @@ void SocketStream::Shutdown(bool Read, bool Write) { THROW_EXCEPTION(ServerException, BadSocketHandle) } - + // Do anything? if(!Read && !Write) return; - + int how = SHUT_RDWR; if(Read && !Write) how = SHUT_RD; if(!Read && Write) how = SHUT_WR; - + // Shut it down! if(::shutdown(mSocketHandle, how) == -1) { |