[Box Backup-commit] COMMIT r1123 - box/trunk/lib/common

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-10-27 20:17:54 +0100 (Fri, 27 Oct 2006)
New Revision: 1123

Modified:
   box/trunk/lib/common/FileStream.cpp
   box/trunk/lib/common/FileStream.h
Log:
Use INVALID_HANDLE_VALUE instead of NULL for invalid handles on Win32.


Modified: box/trunk/lib/common/FileStream.cpp
===================================================================
--- box/trunk/lib/common/FileStream.cpp	2006-10-27 19:17:00 UTC (rev 1122)
+++ box/trunk/lib/common/FileStream.cpp	2006-10-27 19:17:54 UTC (rev 1123)
@@ -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/trunk/lib/common/FileStream.h
===================================================================
--- box/trunk/lib/common/FileStream.h	2006-10-27 19:17:00 UTC (rev 1122)
+++ box/trunk/lib/common/FileStream.h	2006-10-27 19:17:54 UTC (rev 1123)
@@ -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