[Box Backup-dev] COMMIT r584 - box/chris/general/lib/win32
boxbackup-dev at fluffy.co.uk
boxbackup-dev at fluffy.co.uk
Thu May 25 21:15:18 BST 2006
Author: chris
Date: 2006-05-25 20:15:09 +0000 (Thu, 25 May 2006)
New Revision: 584
Modified:
box/chris/general/lib/win32/WinNamedPipeStream.cpp
Log:
* WinNamedPipeStream.cpp
- Compare handle against INVALID_HANDLE_VALUE rather than NULL
(thanks to Pascal Lalonde for spotting this)
Modified: box/chris/general/lib/win32/WinNamedPipeStream.cpp
===================================================================
--- box/chris/general/lib/win32/WinNamedPipeStream.cpp 2006-05-23 01:24:17 UTC (rev 583)
+++ box/chris/general/lib/win32/WinNamedPipeStream.cpp 2006-05-25 20:15:09 UTC (rev 584)
@@ -35,7 +35,7 @@
//
// --------------------------------------------------------------------------
WinNamedPipeStream::WinNamedPipeStream()
- : mSocketHandle(NULL),
+ : mSocketHandle(INVALID_HANDLE_VALUE),
mReadableEvent(INVALID_HANDLE_VALUE),
mBytesInBuffer(0),
mReadClosed(false),
@@ -55,7 +55,7 @@
// --------------------------------------------------------------------------
WinNamedPipeStream::~WinNamedPipeStream()
{
- if (mSocketHandle != NULL)
+ if (mSocketHandle != INVALID_HANDLE_VALUE)
{
Close();
}
@@ -72,7 +72,7 @@
// --------------------------------------------------------------------------
void WinNamedPipeStream::Accept(const wchar_t* pName)
{
- if (mSocketHandle != NULL || mIsConnected)
+ if (mSocketHandle != INVALID_HANDLE_VALUE || mIsConnected)
{
THROW_EXCEPTION(ServerException, SocketAlreadyOpen)
}
@@ -90,7 +90,7 @@
NMPWAIT_USE_DEFAULT_WAIT, // client time-out
NULL); // default security attribute
- if (mSocketHandle == NULL)
+ if (mSocketHandle == INVALID_HANDLE_VALUE)
{
::syslog(LOG_ERR, "CreateNamedPipeW failed: %d",
GetLastError());
@@ -154,7 +154,7 @@
// --------------------------------------------------------------------------
void WinNamedPipeStream::Connect(const wchar_t* pName)
{
- if (mSocketHandle != NULL || mIsConnected)
+ if (mSocketHandle != INVALID_HANDLE_VALUE || mIsConnected)
{
THROW_EXCEPTION(ServerException, SocketAlreadyOpen)
}
@@ -198,7 +198,7 @@
THROW_EXCEPTION(CommonException, AssertFailed)
}
- if (mSocketHandle == NULL || !mIsConnected)
+ if (mSocketHandle == INVALID_HANDLE_VALUE || !mIsConnected)
{
THROW_EXCEPTION(ServerException, BadSocketHandle)
}
@@ -306,7 +306,7 @@
// --------------------------------------------------------------------------
void WinNamedPipeStream::Write(const void *pBuffer, int NBytes)
{
- if (mSocketHandle == NULL || !mIsConnected)
+ if (mSocketHandle == INVALID_HANDLE_VALUE || !mIsConnected)
{
THROW_EXCEPTION(ServerException, BadSocketHandle)
}
@@ -349,14 +349,14 @@
// --------------------------------------------------------------------------
void WinNamedPipeStream::Close()
{
- if (mSocketHandle == NULL && mIsConnected)
+ if (mSocketHandle == INVALID_HANDLE_VALUE && mIsConnected)
{
fprintf(stderr, "Inconsistent connected state\n");
::syslog(LOG_ERR, "Inconsistent connected state");
mIsConnected = false;
}
- if (mSocketHandle == NULL)
+ if (mSocketHandle == INVALID_HANDLE_VALUE)
{
THROW_EXCEPTION(ServerException, BadSocketHandle)
}
@@ -399,7 +399,7 @@
bool result = CloseHandle(mSocketHandle);
- mSocketHandle = NULL;
+ mSocketHandle = INVALID_HANDLE_VALUE;
mIsConnected = false;
mReadClosed = true;
mWriteClosed = true;
@@ -447,7 +447,7 @@
// --------------------------------------------------------------------------
void WinNamedPipeStream::WriteAllBuffered()
{
- if (mSocketHandle == NULL || !mIsConnected)
+ if (mSocketHandle == INVALID_HANDLE_VALUE || !mIsConnected)
{
THROW_EXCEPTION(ServerException, BadSocketHandle)
}
More information about the Boxbackup-dev
mailing list