[Box Backup-dev] COMMIT r590 - box/chris/general/lib/server

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2006-05-27 09:49:39 +0000 (Sat, 27 May 2006)
New Revision: 590

Modified:
   box/chris/general/lib/server/SocketStream.cpp
   box/chris/general/lib/server/SocketStream.h
Log:
* SocketStream.cpp, SocketStream.h
- Use INVALID_SOCKET_HANDLE instead of static member mInvalidHandle


Modified: box/chris/general/lib/server/SocketStream.cpp
===================================================================
--- box/chris/general/lib/server/SocketStream.cpp	2006-05-27 09:48:12 UTC (rev 589)
+++ box/chris/general/lib/server/SocketStream.cpp	2006-05-27 09:49:39 UTC (rev 590)
@@ -36,7 +36,7 @@
 //
 // --------------------------------------------------------------------------
 SocketStream::SocketStream()
-	: mSocketHandle(mInvalidHandle),
+	: mSocketHandle(INVALID_SOCKET_VALUE),
 	  mReadClosed(false),
 	  mWriteClosed(false),
 	  mBytesRead(0),
@@ -85,7 +85,7 @@
 	{
 		THROW_EXCEPTION(ServerException, BadSocketHandle);
 	}
-	if(mSocketHandle == mInvalidHandle)
+	if(mSocketHandle == INVALID_SOCKET_VALUE)
 	{
 		THROW_EXCEPTION(ServerException, DupError);
 	}
@@ -101,7 +101,7 @@
 // --------------------------------------------------------------------------
 SocketStream::~SocketStream()
 {
-	if(mSocketHandle != mInvalidHandle)
+	if(mSocketHandle != INVALID_SOCKET_VALUE)
 	{
 		Close();
 	}
@@ -117,7 +117,7 @@
 // --------------------------------------------------------------------------
 void SocketStream::Attach(int socket)
 {
-	if(mSocketHandle != mInvalidHandle) 
+	if(mSocketHandle != INVALID_SOCKET_VALUE) 
 	{
 		THROW_EXCEPTION(ServerException, SocketAlreadyOpen)
 	}
@@ -137,7 +137,7 @@
 // --------------------------------------------------------------------------
 void SocketStream::Open(int Type, const char *Name, int Port)
 {
-	if(mSocketHandle != mInvalidHandle) 
+	if(mSocketHandle != INVALID_SOCKET_VALUE) 
 	{
 		THROW_EXCEPTION(ServerException, SocketAlreadyOpen)
 	}
@@ -150,7 +150,7 @@
 
 	// Create the socket
 	mSocketHandle = ::socket(sockDomain, SOCK_STREAM, 0 /* let OS choose protocol */);
-	if(mSocketHandle == mInvalidHandle)
+	if(mSocketHandle == INVALID_SOCKET_VALUE)
 	{
 		THROW_EXCEPTION(ServerException, SocketOpenError)
 	}
@@ -164,7 +164,7 @@
 #else
 		::close(mSocketHandle);
 #endif
-		mSocketHandle = mInvalidHandle;
+		mSocketHandle = INVALID_SOCKET_VALUE;
 		THROW_EXCEPTION(ConnectionException, Conn_SocketConnectError)
 	}
 	ResetCounters();
@@ -180,7 +180,7 @@
 // --------------------------------------------------------------------------
 int SocketStream::Read(void *pBuffer, int NBytes, int Timeout)
 {
-	if(mSocketHandle == mInvalidHandle) 
+	if(mSocketHandle == INVALID_SOCKET_VALUE) 
 	{
 		THROW_EXCEPTION(ServerException, BadSocketHandle)
 	}
@@ -256,7 +256,7 @@
 // --------------------------------------------------------------------------
 void SocketStream::Write(const void *pBuffer, int NBytes)
 {
-	if(mSocketHandle == mInvalidHandle) 
+	if(mSocketHandle == INVALID_SOCKET_VALUE) 
 	{
 		THROW_EXCEPTION(ServerException, BadSocketHandle)
 	}
@@ -323,7 +323,7 @@
 // --------------------------------------------------------------------------
 void SocketStream::Close()
 {
-	if(mSocketHandle == mInvalidHandle) 
+	if(mSocketHandle == INVALID_SOCKET_VALUE) 
 	{
 		THROW_EXCEPTION(ServerException, BadSocketHandle)
 	}
@@ -335,7 +335,7 @@
 	{
 		THROW_EXCEPTION(ServerException, SocketCloseError)
 	}
-	mSocketHandle = -1;
+	mSocketHandle = INVALID_SOCKET_VALUE;
 }
 
 // --------------------------------------------------------------------------
@@ -348,7 +348,7 @@
 // --------------------------------------------------------------------------
 void SocketStream::Shutdown(bool Read, bool Write)
 {
-	if(mSocketHandle == mInvalidHandle) 
+	if(mSocketHandle == INVALID_SOCKET_VALUE) 
 	{
 		THROW_EXCEPTION(ServerException, BadSocketHandle)
 	}
@@ -406,7 +406,7 @@
 // --------------------------------------------------------------------------
 tOSSocketHandle SocketStream::GetSocketHandle()
 {
-	if(mSocketHandle == mInvalidHandle) 
+	if(mSocketHandle == INVALID_SOCKET_VALUE) 
 	{
 		THROW_EXCEPTION(ServerException, BadSocketHandle)
 	}

Modified: box/chris/general/lib/server/SocketStream.h
===================================================================
--- box/chris/general/lib/server/SocketStream.h	2006-05-27 09:48:12 UTC (rev 589)
+++ box/chris/general/lib/server/SocketStream.h	2006-05-27 09:49:39 UTC (rev 590)
@@ -14,8 +14,10 @@
 
 #ifdef WIN32
 	typedef SOCKET tOSSocketHandle;
+	#define INVALID_SOCKET_VALUE (tOSSocketHandle)(-1)
 #else
 	typedef int tOSSocketHandle;
+	#define INVALID_SOCKET_VALUE -1
 #endif
 
 // --------------------------------------------------------------------------
@@ -56,7 +58,6 @@
 	tOSSocketHandle mSocketHandle;
 	bool mReadClosed;
 	bool mWriteClosed;
-	static const tOSSocketHandle mInvalidHandle = -1;
 
 protected:
 	off_t mBytesRead;