Redundant code

TemporaryFileCopyParam already clears the IncludeFileMask

(cherry picked from commit 6b5d56f0bf54c882b170b179655ea0091282bf05)

Source commit: 503b217a8eac08e3317a16fcb5c3a1364e846588

source/forms/CustomScpExplorer.cpp

@@ -2008,7 +2008,7 @@ void __fastcall TCustomScpExplorerForm::LocalCustomCommandPure(
     bool RemoteFiles = FLAGSET(ACommand.Params, ccRemoteFiles);
     if (!RemoteFiles)
     {
-      TemporarilyDownloadFiles(FileList, false, RootTempDir, TempDir, false, false, true);
+      TemporarilyDownloadFiles(FileList, false, RootTempDir, TempDir, false, true);
     }
 
     try
@@ -3396,7 +3396,7 @@ void __fastcall TCustomScpExplorerForm::TemporaryDirectoryForRemoteFiles(
 //---------------------------------------------------------------------------
 void __fastcall TCustomScpExplorerForm::TemporarilyDownloadFiles(
   TStrings * FileList, bool ForceText, UnicodeString & RootTempDir, UnicodeString & TempDir,
-  bool AllFiles, bool GetTargetNames, bool AutoOperation)
+  bool GetTargetNames, bool AutoOperation)
 {
   DebugAssert(!IsLocalBrowserMode());
   TCopyParamType CopyParam = GUIConfiguration->CurrentCopyParam;
@@ -3405,10 +3405,6 @@ void __fastcall TCustomScpExplorerForm::TemporarilyDownloadFiles(
     CopyParam.TransferMode = tmAscii;
   }
   TemporaryFileCopyParam(CopyParam);
-  if (AllFiles)
-  {
-    CopyParam.IncludeFileMask = TFileMasks();
-  }
 
   if (TempDir.IsEmpty())
   {
@@ -3582,7 +3578,7 @@ void __fastcall TCustomScpExplorerForm::ExecuteFile(TOperationSide Side,
         FileList1->AddObject(FullFileName, Object);
         TemporarilyDownloadFiles(FileList1,
           RemoteExecuteForceText(ExecuteFileBy, ExternalEditor),
-          LocalRootDirectory, LocalDirectory, true, true, true);
+          LocalRootDirectory, LocalDirectory, true, true);
         LocalFileName = LocalDirectory + FileList1->Strings[0];
       }
       __finally
@@ -3845,8 +3841,7 @@ void __fastcall TCustomScpExplorerForm::ExecutedFileReload(
     UnicodeString RootTempDir = Data->LocalRootDirectory;
     UnicodeString TempDir = ExtractFilePath(FileName);
 
-    TemporarilyDownloadFiles(FileList.get(), Data->ForceText, RootTempDir,
-      TempDir, true, true, true);
+    TemporarilyDownloadFiles(FileList.get(), Data->ForceText, RootTempDir, TempDir, true, true);
 
     // sanity check, the target file name should be still the same
     DebugAssert(ExtractFileName(FileName) == FileList->Strings[0]);
@@ -4183,7 +4178,7 @@ bool __fastcall TCustomScpExplorerForm::RemoteTransferFiles(
       UnicodeString RootTempDir;
       UnicodeString TempDir;
 
-      TemporarilyDownloadFiles(FileList, false, RootTempDir, TempDir, false, false, false);
+      TemporarilyDownloadFiles(FileList, false, RootTempDir, TempDir, false, false);
 
       TStrings * TemporaryFilesList = new TStringList();
 

source/forms/CustomScpExplorer.h

@@ -557,7 +557,7 @@ protected:
     UnicodeString RemoteDirectory, TCopyParamType CopyParam,
     UnicodeString & Result, UnicodeString & RootDirectory);
   void __fastcall TemporarilyDownloadFiles(TStrings * FileList, bool ForceText,
-    UnicodeString & RootTempDir, UnicodeString & TempDir, bool AllFiles, bool GetTargetNames,
+    UnicodeString & RootTempDir, UnicodeString & TempDir, bool GetTargetNames,
     bool AutoOperation);
   void __fastcall LocalEditorClosed(TObject * Sender, bool Forced);
   TTBXPopupMenu * __fastcall HistoryMenu(TOperationSide Side, bool Back);