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

diff --git a/rfb/FileManager.cxx b/rfb/FileManager.cxx
index bcc1281e39dd376e8183703861eb1c32ef9cb55a..9592152b9496b5f65e185e11c6dd9c407d515b5d 100644 (file)
--- 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 f176036152b818071f6f4902776844f8a751bc29..609f2818f85d49c5dcf25bc1a51e608a072a0641 100644 (file)
--- 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 23d275694e646228d616ae1ca9ea06b8f7863138..5b533ac1c83a154a0025455876ac5b389a91e203 100644 (file)
--- 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 6a3713feb097c9213a3523f74210827a32aad763..e6ec064bbb121fd76745558a6889b53bf03eb1c4 100644 (file)
--- 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 4ad285b7ddf97959d393ffe1ff5801528e7fac8e..6503cc9c88ca7213e45646d4cbf4696acc1d6645 100644 (file)
--- 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 7d8aa98b4977ad48af5432ff201e9922905a3f33..3b3318ab560af7429c7c2a127b96b448f976dbec 100644 (file)
--- 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);
   };

diff --git a/vncviewer/FileTransfer.h b/vncviewer/FileTransfer.h
index a81a2efe3f15b1fa3ef3cb830a3f326b7a597d6f..3a56f3f1f7e50019dd1db8bd700a0fa7e415b93c 100644 (file)
--- a/vncviewer/FileTransfer.h
+++ b/vncviewer/FileTransfer.h
@@ -28,6 +28,8 @@
 #include <rdr/OutStream.h>
 #include <rfb/msgTypes.h>
 #include <rfb/FileInfo.h>
+#include <rfb/FileReader.h>
+#include <rfb/FileWriter.h>
 #include <rfb/TransferQueue.h>
 #include <vncviewer/FTDialog.h>
 #include <vncviewer/FTMsgReader.h>