Small code improvements in the file managing classes.

Added FileReader and FileWriter object variables to the FileTransfer class.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@421 3789f03b-4d11-0410-bbf8-ca57d06f2519

6 files changed, 8 insertions, 8 deletions

diff --git a/rfb/FileManager.cxx b/rfb/FileManager.cxx
index bcc1281e..9592152b 100644
--- a/rfb/FileManager.cxx
+++ b/rfb/FileManager.cxx
@@ -36,10 +36,12 @@ FileManager::~FileManager()
 }
 
 bool 
-FileManager::create()
+FileManager::create(char *pFilename)
 {
   if (m_pFile != NULL) return false;
   
+  strcpy(m_szFilename, pFilename);
+
   m_pFile = fopen(m_szFilename, m_szMode);
   
   if (m_pFile == NULL) {
diff --git a/rfb/FileManager.h b/rfb/FileManager.h
index f1760361..609f2818 100644
--- a/rfb/FileManager.h
+++ b/rfb/FileManager.h
@@ -32,7 +32,7 @@ namespace rfb {
     FileManager();
     ~FileManager();
     
-    bool create();
+    bool create(char *pFilename);
     bool close();
     
   protected:
diff --git a/rfb/FileReader.cxx b/rfb/FileReader.cxx
index 23d27569..5b533ac1 100644
--- a/rfb/FileReader.cxx
+++ b/rfb/FileReader.cxx
@@ -25,9 +25,8 @@
 
 using namespace rfb;
 
-FileReader::FileReader(char *pFilename)
+FileReader::FileReader()
 {
-  strcpy(m_szFilename, pFilename);
   strcpy(m_szMode, "r");
 }
 
diff --git a/rfb/FileReader.h b/rfb/FileReader.h
index 6a3713fe..e6ec064b 100644
--- a/rfb/FileReader.h
+++ b/rfb/FileReader.h
@@ -29,7 +29,7 @@
 namespace rfb {
   class FileReader : public FileManager {
   public:
-    FileReader(char *pFilename);
+    FileReader();
 
     bool read(void *pBuf, unsigned int count, unsigned int *pBytesRead);
   };
diff --git a/rfb/FileWriter.cxx b/rfb/FileWriter.cxx
index 4ad285b7..6503cc9c 100644
--- a/rfb/FileWriter.cxx
+++ b/rfb/FileWriter.cxx
@@ -25,9 +25,8 @@
 
 using namespace rfb;
 
-FileWriter::FileWriter(char *pFilename)
+FileWriter::FileWriter()
 {
-  strcpy(m_szFilename, pFilename);
   strcpy(m_szMode, "w");
 }
 
diff --git a/rfb/FileWriter.h b/rfb/FileWriter.h
index 7d8aa98b..3b3318ab 100644
--- a/rfb/FileWriter.h
+++ b/rfb/FileWriter.h
@@ -29,7 +29,7 @@
 namespace rfb {
   class FileWriter : public FileManager {
   public:
-    FileWriter(char *pFilename);
+    FileWriter();
 
     bool write(const void *pBuf, unsigned int count, unsigned int *pBytesWritten);
   };