[Box Backup-commit] COMMIT r950 - box/chris/merge/lib/common
subversion at fluffy.co.uk
subversion at fluffy.co.uk
Mon Sep 4 00:39:08 BST 2006
Author: chris
Date: 2006-09-04 00:39:08 +0100 (Mon, 04 Sep 2006)
New Revision: 950
Modified:
box/chris/merge/lib/common/FileStream.cpp
box/chris/merge/lib/common/FileStream.h
Log:
(refs #3)
Use INVALID_HANDLE_VALUE instead of NULL for invalid handles on Win32
Modified: box/chris/merge/lib/common/FileStream.cpp
===================================================================
--- box/chris/merge/lib/common/FileStream.cpp 2006-09-03 23:35:48 UTC (rev 949)
+++ box/chris/merge/lib/common/FileStream.cpp 2006-09-03 23:39:08 UTC (rev 950)
@@ -30,7 +30,7 @@
mIsEOF(false)
{
#ifdef WIN32
- if(mOSFileHandle == 0)
+ if(mOSFileHandle == INVALID_HANDLE_VALUE)
#else
if(mOSFileHandle < 0)
#endif
@@ -56,7 +56,11 @@
: mOSFileHandle(FileDescriptor),
mIsEOF(false)
{
+#ifdef WIN32
+ if(mOSFileHandle == INVALID_HANDLE_VALUE)
+#else
if(mOSFileHandle < 0)
+#endif
{
MEMLEAKFINDER_NOT_A_LEAK(this);
THROW_EXCEPTION(CommonException, OSFileOpenError)
@@ -76,7 +80,11 @@
: mOSFileHandle(::dup(rToCopy.mOSFileHandle)),
mIsEOF(rToCopy.mIsEOF)
{
+#ifdef WIN32
+ if(mOSFileHandle == INVALID_HANDLE_VALUE)
+#else
if(mOSFileHandle < 0)
+#endif
{
MEMLEAKFINDER_NOT_A_LEAK(this);
THROW_EXCEPTION(CommonException, OSFileOpenError)
Modified: box/chris/merge/lib/common/FileStream.h
===================================================================
--- box/chris/merge/lib/common/FileStream.h 2006-09-03 23:35:48 UTC (rev 949)
+++ box/chris/merge/lib/common/FileStream.h 2006-09-03 23:39:08 UTC (rev 950)
@@ -21,7 +21,7 @@
#endif
#ifdef WIN32
- #define INVALID_FILE NULL
+ #define INVALID_FILE INVALID_HANDLE_VALUE
typedef HANDLE tOSFileHandle;
#else
#define INVALID_FILE -1
More information about the Boxbackup-commit
mailing list