[Box Backup-commit] COMMIT r1010 - box/chris/general/lib/common

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-10-13 23:36:56 +0100 (Fri, 13 Oct 2006)
New Revision: 1010

Modified:
   box/chris/general/lib/common/FileStream.cpp
   box/chris/general/lib/common/FileStream.h
Log:
 * Use INVALID_HANDLE_VALUE instead of NULL to represent invalid file handles
   under Win32


Modified: box/chris/general/lib/common/FileStream.cpp
===================================================================
--- box/chris/general/lib/common/FileStream.cpp	2006-10-13 22:36:02 UTC (rev 1009)
+++ box/chris/general/lib/common/FileStream.cpp	2006-10-13 22:36:56 UTC (rev 1010)
@@ -273,7 +273,7 @@
 	conv.QuadPart = Offset;
 	DWORD retVal = SetFilePointer(this->mOSFileHandle, conv.LowPart, &conv.HighPart, ConvertSeekTypeToOSWhence(SeekType));
 
-	if ( retVal == INVALID_SET_FILE_POINTER && (GetLastError() != NO_ERROR) )
+	if(retVal == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR)
 	{
 		THROW_EXCEPTION(CommonException, OSFileError)
 	}
@@ -299,25 +299,25 @@
 // --------------------------------------------------------------------------
 void FileStream::Close()
 {
-	if(mOSFileHandle < 0)
+	if(mOSFileHandle == INVALID_FILE)
 	{
 		THROW_EXCEPTION(CommonException, FileAlreadyClosed)
 	}
+
 #ifdef WIN32
 	if(::CloseHandle(mOSFileHandle) == 0)
 	{
 		THROW_EXCEPTION(CommonException, OSFileCloseError)
 	}
-	mOSFileHandle = NULL;
-	mIsEOF = true;
 #else
 	if(::close(mOSFileHandle) != 0)
 	{
 		THROW_EXCEPTION(CommonException, OSFileCloseError)
 	}
-	mOSFileHandle = -1;
+#endif
+
+	mOSFileHandle = INVALID_FILE;
 	mIsEOF = true;
-#endif
 }
 
 

Modified: box/chris/general/lib/common/FileStream.h
===================================================================
--- box/chris/general/lib/common/FileStream.h	2006-10-13 22:36:02 UTC (rev 1009)
+++ box/chris/general/lib/common/FileStream.h	2006-10-13 22:36:56 UTC (rev 1010)
@@ -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