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

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2008-08-21 11:12:55 +0100 (Thu, 21 Aug 2008)
New Revision: 2243

Modified:
   box/trunk/lib/common/FileStream.cpp
   box/trunk/lib/common/FileStream.h
Log:
Change FileStream constructor to take a const std::string& instead of a 
char array pointer, for C++ style.


Modified: box/trunk/lib/common/FileStream.cpp
===================================================================
--- box/trunk/lib/common/FileStream.cpp	2008-08-21 10:11:27 UTC (rev 2242)
+++ box/trunk/lib/common/FileStream.cpp	2008-08-21 10:12:55 UTC (rev 2243)
@@ -24,14 +24,14 @@
 //		Created: 2003/07/31
 //
 // --------------------------------------------------------------------------
-FileStream::FileStream(const char *Filename, int flags, int mode)
+FileStream::FileStream(const std::string& rFilename, int flags, int mode)
 #ifdef WIN32
-	: mOSFileHandle(::openfile(Filename, flags, mode)),
+	: mOSFileHandle(::openfile(rFilename.c_str(), flags, mode)),
 #else
-	: mOSFileHandle(::open(Filename, flags, mode)),
+	: mOSFileHandle(::open(rFilename.c_str(), flags, mode)),
 #endif
 	  mIsEOF(false),
-	  mFileName(Filename)
+	  mFileName(rFilename)
 {
 #ifdef WIN32
 	if(mOSFileHandle == INVALID_HANDLE_VALUE)
@@ -48,7 +48,7 @@
 		else
 		{
 			BOX_LOG_SYS_WARNING("Failed to open file: " <<
-				Filename);
+				rFilename);
 			THROW_EXCEPTION(CommonException, OSFileOpenError)
 		}
 	}

Modified: box/trunk/lib/common/FileStream.h
===================================================================
--- box/trunk/lib/common/FileStream.h	2008-08-21 10:11:27 UTC (rev 2242)
+++ box/trunk/lib/common/FileStream.h	2008-08-21 10:12:55 UTC (rev 2243)
@@ -31,7 +31,7 @@
 class FileStream : public IOStream
 {
 public:
-	FileStream(const char *Filename, 
+	FileStream(const std::string& rFilename, 
 #ifdef WIN32
 		int flags = (O_RDONLY | O_BINARY),
 #else