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

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2006-12-14 22:40:02 +0000 (Thu, 14 Dec 2006)
New Revision: 1201

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


Modified: box/trunk/lib/common/FileStream.cpp
===================================================================
--- box/trunk/lib/common/FileStream.cpp	2006-12-14 22:37:55 UTC (rev 1200)
+++ box/trunk/lib/common/FileStream.cpp	2006-12-14 22:40:02 UTC (rev 1201)
@@ -274,7 +274,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)
 	}
@@ -300,25 +300,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
 }