Clang fix

Author: dcwhite

src/Core/Services/FileTransferClient.cc

@@ -6,7 +6,7 @@
    Copyright (c) 2009 Scientific Computing and Imaging Institute,
    University of Utah.
 
-   
+
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
    to deal in the Software without restriction, including without limitation
@@ -47,15 +47,15 @@ FileTransferClient::~FileTransferClient()
     if (tempdir_ != "") tfm_->delete_tempdir(tempdir_);
     tempdir_ = "";
 }
-    
+
 
 bool FileTransferClient::open(IComAddressHandle address, std::string servicename, int session, std::string passwd)
 {
     if(!(ServiceClient::open(address,servicename,session,passwd)))
     {
         return(false);
     }
-    
+
     IComPacketHandle packet;
     // The next function will create the packet
     if (!(recv(packet)))
@@ -74,7 +74,7 @@ bool FileTransferClient::open(IComAddressHandle address, std::string servicename
     {
         buffersize_ = packet->getparam1();
         std::vector<std::string> data = packet->getvector();
-        
+
         remote_homedirid_ = data[0];
         remote_scirun_tempdir_ = data[1];
 
@@ -95,7 +95,7 @@ bool FileTransferClient::create_remote_tempdir(std::string pattern,std::string &
     {
         seterror("Could not create IComPacket");
         tempdir = "";
-        return(false);    
+        return(false);
     }
     packet->settag(TAG_TDIR);
     packet->setstring(pattern);
@@ -132,11 +132,11 @@ bool FileTransferClient::create_local_tempdir(std::string pattern,std::string &t
     return(tfm_->create_tempdir(pattern,tempdir));
 }
 
-   
+
 bool FileTransferClient::get_local_homedirid(std::string& homeid)
 {
     homeid = local_homedirid_;
-    if (homeid == "") 
+    if (homeid == "")
     {
         local_homedirid_ = tfm_->get_homedirID();
         homeid = local_homedirid_;
@@ -155,7 +155,7 @@ bool FileTransferClient::get_remote_homedirid(std::string& homeid)
 bool FileTransferClient::get_local_scirun_tempdir(std::string& tempdir)
 {
     tempdir = local_scirun_tempdir_;
-    if (tempdir == "") 
+    if (tempdir == "")
     {
         local_scirun_tempdir_ = tfm_->get_scirun_tmp_dir();
         tempdir = local_scirun_tempdir_;
@@ -177,7 +177,7 @@ bool FileTransferClient::translate_scirun_tempdir(std::string& tempdir)
     {
         size_t rt = remote_scirun_tempdir_.size();
         size_t lt = local_scirun_tempdir_.size();
-        
+
         if (rt > lt)
         {
             if (tempdir.substr(0,rt) == remote_scirun_tempdir_)
@@ -211,27 +211,27 @@ bool FileTransferClient::translate_scirun_tempdir(std::string& tempdir)
         return(true);
     }
 }
-        
+
 bool FileTransferClient::get_file(std::string remotefilename,std::string localfilename)
 {
     FILE* localfile;
     int fileid = fileidcnt_++;
-    
+
     localfile = ::fopen(localfilename.c_str(),"w");
     if (localfile == 0)
     {
         seterror("Could not open local filename");
         return(false);
     }
-    
+
     IComPacketHandle packet(new IComPacket);
     if (!packet)
     {
         ::fclose(localfile);
         seterror("Could not create IComPacket");
-        return(false);    
-    }    
-    
+        return(false);
+    }
+
     packet->settag(TAG_FGET);
     packet->setid(fileid);
     packet->setstring(remotefilename);
@@ -242,7 +242,7 @@ bool FileTransferClient::get_file(std::string remotefilename,std::string localfi
         return(false);
     }
     bool done  = false;
-    
+
     while (!done)
     {
         if (!(recv(packet)))
@@ -266,7 +266,7 @@ bool FileTransferClient::get_file(std::string remotefilename,std::string localfi
             seterror("Received unknown packet");
             return(false);
         }
-        
+
         if ( ::fseek(localfile,static_cast<long>(packet->getparam1()),SEEK_SET) < 0)
         {
             ::fclose(localfile);
@@ -276,65 +276,65 @@ bool FileTransferClient::get_file(std::string remotefilename,std::string localfi
             seterror("Fseek error writing local file");
             return(false);
         }
-        
+
         if ( ::fwrite(packet->getbuffer(),1,static_cast<size_t>(packet->getdatasize()),localfile) != static_cast<size_t>(packet->getdatasize()))
         {
             ::fclose(localfile);
             packet->clear();
             packet->settag(TAG_FRESET);
             send(packet);
             seterror("Error writing local file");
-            return(false);        
+            return(false);
         }
-        
+
         if (packet->gettag() == TAG_FEND)
         {
             done = true;
             packet->clear();
             continue;
         }
-        
+
         int nextoffset = packet->getparam1()+packet->getdatasize();
         packet->clear();
         packet->settag(TAG_FNEXTDATA);
         packet->setid(fileid);
         packet->setparam1(nextoffset);
-        
+
         if (!(send(packet)))
         {
             ::fclose(localfile);
             seterror("Error sending packet to file transfer service");
             return(false);
         }
     }
-     
+
     ::fclose(localfile);
-    clearerror(); 
-    return(true);        
+    clearerror();
+    return(true);
 }
 
 
 bool FileTransferClient::put_file(std::string localfilename,std::string remotefilename)
 {
-    
+
     FILE* localfile;
     int fileid = fileidcnt_++;
-    
+
     localfile = ::fopen(localfilename.c_str(),"r");
     if (localfile == 0)
     {
         seterror("Could not open local filename");
         return(false);
     }
-    
+
     IComPacketHandle packet(new IComPacket);
     if (!packet)
     {
         seterror("Could not create IComPacket");
         ::fclose(localfile);
-        return(false);    
+        return(false);
     }
-    
+
     packet->settag(TAG_FPUT);
     packet->setid(fileid);
     packet->setstring(remotefilename);
@@ -369,7 +369,7 @@ bool FileTransferClient::put_file(std::string localfilename,std::string remotefi
             seterror("Received unknown packet");
             return(false);
         }
-        
+
         if ( ::fseek(localfile,static_cast<long>(packet->getparam1()),SEEK_SET) < 0)
         {
             ::fclose(localfile);
@@ -379,17 +379,17 @@ bool FileTransferClient::put_file(std::string localfilename,std::string remotefi
             seterror("Fseek error reading local file");
             return(false);
         }
-        
+
         int seekpos = packet->getparam1();
         size_t bytesread = 0;
-        
+
         packet->clear();
         packet->newbuffer(buffersize_);
         packet->setid(fileid);
         packet->setparam1(seekpos);
-        
+
         bytesread = ::fread(packet->getbuffer(),1,buffersize_,localfile);
-        
+
         if (bytesread < buffersize_)
         {
             packet->setdatasize(bytesread);
@@ -402,21 +402,21 @@ bool FileTransferClient::put_file(std::string localfilename,std::string remotefi
             packet->setdatasize(bytesread);
             packet->settag(TAG_FDATA);
         }
-        
+
         if (!(send(packet)))
         {
             ::fclose(localfile);
             seterror("Error sending packet to file transfer service");
             return(false);
         }
     }
-     
+
     ::fclose(localfile);
-    clearerror(); 
-    return(true);        
+    clearerror();
+    return(true);
 }
-    
- 
+
+
 
 bool FileTransferClient::set_local_dir(std::string dir)
 {
@@ -441,7 +441,5 @@ std::string FileTransferClient::remote_file(std::string filename)
 {
   return(remote_dir_ + filename);
 }
- 
-} // end namespace
- 
 
+} // end namespace

src/Core/Services/FileTransferClient.h

@@ -6,7 +6,7 @@
    Copyright (c) 2009 Scientific Computing and Imaging Institute,
    University of Utah.
 
-   
+
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
    to deal in the Software without restriction, including without limitation
@@ -41,7 +41,7 @@ class SCISHARE FileTransferClient : public ServiceClient
   public:
     FileTransferClient();
     ~FileTransferClient();
-    
+
     // open this service. This overloaded open function will deal as well with the first packet send
     // by the service, which is an information packet. Containing location and ID of the remote home
     // directory
@@ -51,53 +51,53 @@ class SCISHARE FileTransferClient : public ServiceClient
     // XXXXXX which will be replace by an uniquely generated string of numbers and letters
     bool create_remote_tempdir(std::string pattern,std::string &tempdir);
     bool create_local_tempdir(std::string pattern,std::string &tempdir);
-    
+
     // To identify the homedirectories, SCIRun will write a file with a hopefully unique key
     // that identifies that directory uniquely. Currently this is only done by the local clock
     // and a randomnumber generator. This needs to be replaced with the UUID code, which is
     // being included into SCIRun2, but does not have OSX support and still does not function
     // all the way. Currently id's are strings that can be replaced with any other object that
-    // can be written to a string such as UUIDs 
+    // can be written to a string such as UUIDs
     bool get_local_homedirid(std::string& homeid);
     bool get_remote_homedirid(std::string& homeid);
-    
+
     // Get the path to the local SCIRun temp directory and the remote one.
     // Although the directory may point to the same underlying shared drive
     // the paths may be different. The function translate_scirun_tempdir translates
     // local filenames to remote filenames.
     bool get_local_scirun_tempdir(std::string& tempdir);
     bool get_remote_scirun_tempdir(std::string& tempdir);
     bool translate_scirun_tempdir(std::string& tempdir);
-    
+
     // These are the functions for transfering files forwards and backwards
     // between systems. These functions will do the transfer protocol.
     // They rely on the full filename (that includes the path)
     bool get_file(std::string localfilename,std::string remotefilename);
     bool put_file(std::string remotefilename,std::string localfilename);
-    
-    // The next set of functions are only local and are meant to simplify 
+
+    // The next set of functions are only local and are meant to simplify
     // the task of keeping track what the remote and local directory are called
     // set_local_dir sets the local temp directories path. This should preferably
     // be an absolute path. The set_remote_dir does the same for the remote directory
     // To generate filenames on both systems, local_file() will take the filename and
     // put the local_directory in front of it and remote_file() will put the remote
-    // directory path in front of the filename. 
-    inline bool set_local_dir(std::string dir);
-    inline bool set_remote_dir(std::string dir);
-    inline std::string local_file(std::string filename);
-    inline std::string remote_file(std::string filename);
-    
+    // directory path in front of the filename.
+    bool set_local_dir(std::string dir);
+    bool set_remote_dir(std::string dir);
+    std::string local_file(std::string filename);
+    std::string remote_file(std::string filename);
+
   private:
     std::string tempdir_;
-    
+
     std::string local_scirun_tempdir_;
     std::string remote_scirun_tempdir_;
     std::string local_homedirid_;
     std::string remote_homedirid_;
-    
+
     std::string remote_dir_;
     std::string local_dir_;
-    
+
     boost::shared_ptr<class TempFileManager> tfm_;
 
     int fileidcnt_;
@@ -108,7 +108,7 @@ class SCISHARE FileTransferClient : public ServiceClient
 typedef boost::shared_ptr<FileTransferClient> FileTransferClientHandle;
 
 
- 
+
 } // end namespace
- 
+
 #endif