Unused code

Source commit: 77715db778b119a33d8ac6c3fdfe407f6b22d5b0

source/core/RemoteFiles.cpp

@@ -1565,10 +1565,11 @@ __fastcall TRemoteFileList::TRemoteFileList():
   FTimestamp = Now();
 }
 //---------------------------------------------------------------------------
-void __fastcall TRemoteFileList::AddFile(TRemoteFile * File)
+bool TRemoteFileList::AddFile(TRemoteFile * File)
 {
   Add(File);
   File->Directory = this;
+  return true;
 }
 //---------------------------------------------------------------------------
 TStrings * __fastcall TRemoteFileList::CloneStrings(TStrings * List)
@@ -1611,7 +1612,7 @@ void __fastcall TRemoteFileList::Reset()
   Clear();
 }
 //---------------------------------------------------------------------------
-void __fastcall TRemoteFileList::SetDirectory(UnicodeString value)
+void TRemoteFileList::SetDirectory(const UnicodeString & value)
 {
   FDirectory = UnixExcludeTrailingBackslash(value);
 }
@@ -1654,16 +1655,13 @@ TRemoteFile * __fastcall TRemoteFileList::FindFile(const UnicodeString &FileName
 __fastcall TRemoteDirectory::TRemoteDirectory(TTerminal * aTerminal, TRemoteDirectory * Template) :
   TRemoteFileList(), FTerminal(aTerminal)
 {
-  FThisDirectory = NULL;
   FParentDirectory = NULL;
   if (Template == NULL)
   {
-    FIncludeThisDirectory = false;
     FIncludeParentDirectory = true;
   }
   else
   {
-    FIncludeThisDirectory = Template->FIncludeThisDirectory;
     FIncludeParentDirectory = Template->FIncludeParentDirectory;
   }
 }
@@ -1675,12 +1673,7 @@ __fastcall TRemoteDirectory::~TRemoteDirectory()
 //---------------------------------------------------------------------------
 void __fastcall TRemoteDirectory::ReleaseRelativeDirectories()
 {
-  if ((ThisDirectory != NULL) && !IncludeThisDirectory)
-  {
-    delete FThisDirectory;
-    FThisDirectory = NULL;
-  }
-  if ((ParentDirectory != NULL) && !IncludeParentDirectory)
+  if ((FParentDirectory != NULL) && !IncludeParentDirectory)
   {
     delete FParentDirectory;
     FParentDirectory = NULL;
@@ -1693,34 +1686,35 @@ void __fastcall TRemoteDirectory::Reset()
   TRemoteFileList::Reset();
 }
 //---------------------------------------------------------------------------
-void __fastcall TRemoteDirectory::SetDirectory(UnicodeString value)
+bool TRemoteDirectory::AddFile(TRemoteFile * File)
 {
-  TRemoteFileList::SetDirectory(value);
-}
-//---------------------------------------------------------------------------
-void __fastcall TRemoteDirectory::AddFile(TRemoteFile * File)
-{
-  if (File->IsThisDirectory) FThisDirectory = File;
-  if (File->IsParentDirectory) FParentDirectory = File;
-
-  if ((!File->IsThisDirectory || IncludeThisDirectory) &&
-      (!File->IsParentDirectory || IncludeParentDirectory))
+  bool Result = !File->IsThisDirectory;
+  if (!Result)
   {
-    TRemoteFileList::AddFile(File);
+    delete File;
+  }
+  else
+  {
+    if (File->IsParentDirectory)
+    {
+      FParentDirectory = File;
+    }
+
+    if (!File->IsParentDirectory || IncludeParentDirectory)
+    {
+      DebugCheck(TRemoteFileList::AddFile(File));
+    }
+    File->Terminal = Terminal;
   }
-  File->Terminal = Terminal;
+  return Result;
 }
 //---------------------------------------------------------------------------
 void __fastcall TRemoteDirectory::DuplicateTo(TRemoteFileList * Copy)
 {
   TRemoteFileList::DuplicateTo(Copy);
-  if (ThisDirectory && !IncludeThisDirectory)
-  {
-    Copy->AddFile(ThisDirectory->Duplicate(false));
-  }
-  if (ParentDirectory && !IncludeParentDirectory)
+  if ((FParentDirectory != NULL) && !IncludeParentDirectory)
   {
-    Copy->AddFile(ParentDirectory->Duplicate(false));
+    Copy->AddFile(FParentDirectory->Duplicate(false));
   }
 }
 //---------------------------------------------------------------------------
@@ -1734,33 +1728,15 @@ void __fastcall TRemoteDirectory::SetIncludeParentDirectory(Boolean value)
   if (IncludeParentDirectory != value)
   {
     FIncludeParentDirectory = value;
-    if (value && ParentDirectory)
-    {
-      DebugAssert(IndexOf(ParentDirectory) < 0);
-      Add(ParentDirectory);
-    }
-    else if (!value && ParentDirectory)
-    {
-      DebugAssert(IndexOf(ParentDirectory) >= 0);
-      Extract(ParentDirectory);
-    }
-  }
-}
-//---------------------------------------------------------------------------
-void __fastcall TRemoteDirectory::SetIncludeThisDirectory(Boolean value)
-{
-  if (IncludeThisDirectory != value)
-  {
-    FIncludeThisDirectory = value;
-    if (value && ThisDirectory)
+    if (value && (FParentDirectory != NULL))
     {
-      DebugAssert(IndexOf(ThisDirectory) < 0);
-      Add(ThisDirectory);
+      DebugAssert(IndexOf(FParentDirectory) < 0);
+      Add(FParentDirectory);
     }
-    else if (!value && ThisDirectory)
+    else if (!value && (FParentDirectory != NULL))
     {
-      DebugAssert(IndexOf(ThisDirectory) >= 0);
-      Extract(ThisDirectory);
+      DebugAssert(IndexOf(FParentDirectory) >= 0);
+      Extract(FParentDirectory);
     }
   }
 }

source/core/RemoteFiles.h

@@ -211,7 +211,7 @@ protected:
   UnicodeString FDirectory;
   TDateTime FTimestamp;
   TRemoteFile * __fastcall GetFiles(Integer Index);
-  virtual void __fastcall SetDirectory(UnicodeString value);
+  void SetDirectory(const UnicodeString & value);
   UnicodeString __fastcall GetFullDirectory();
   Boolean __fastcall GetIsRoot();
   TRemoteFile * __fastcall GetParentDirectory();
@@ -222,7 +222,7 @@ public:
   virtual void __fastcall Reset();
   TRemoteFile * __fastcall FindFile(const UnicodeString &FileName);
   virtual void __fastcall DuplicateTo(TRemoteFileList * Copy);
-  virtual void __fastcall AddFile(TRemoteFile * File);
+  virtual bool AddFile(TRemoteFile * File);
 
   static TStrings * __fastcall CloneStrings(TStrings * List);
   static bool AnyDirectory(TStrings * List);
@@ -238,31 +238,22 @@ public:
 //---------------------------------------------------------------------------
 class TRemoteDirectory : public TRemoteFileList
 {
-friend class TSCPFileSystem;
-friend class TSFTPFileSystem;
 private:
   Boolean FIncludeParentDirectory;
-  Boolean FIncludeThisDirectory;
   TTerminal * FTerminal;
   TRemoteFile * FParentDirectory;
-  TRemoteFile * FThisDirectory;
-  virtual void __fastcall SetDirectory(UnicodeString value);
   Boolean __fastcall GetLoaded();
   void __fastcall SetIncludeParentDirectory(Boolean value);
-  void __fastcall SetIncludeThisDirectory(Boolean value);
   void __fastcall ReleaseRelativeDirectories();
 public:
   __fastcall TRemoteDirectory(TTerminal * aTerminal, TRemoteDirectory * Template = NULL);
   virtual __fastcall ~TRemoteDirectory();
-  virtual void __fastcall AddFile(TRemoteFile * File);
+  virtual bool AddFile(TRemoteFile * File);
   virtual void __fastcall DuplicateTo(TRemoteFileList * Copy);
   virtual void __fastcall Reset();
-  __property TTerminal * Terminal = { read = FTerminal, write = FTerminal };
+  __property TTerminal * Terminal = { read = FTerminal };
   __property Boolean IncludeParentDirectory = { read = FIncludeParentDirectory, write = SetIncludeParentDirectory };
-  __property Boolean IncludeThisDirectory = { read = FIncludeThisDirectory, write = SetIncludeThisDirectory };
   __property Boolean Loaded = { read = GetLoaded };
-  __property TRemoteFile * ParentDirectory = { read = FParentDirectory };
-  __property TRemoteFile * ThisDirectory = { read = FThisDirectory };
 };
 //---------------------------------------------------------------------------
 class TRemoteDirectoryCache : private TStringList

source/core/SftpFileSystem.cpp

@@ -3601,9 +3601,8 @@ void __fastcall TSFTPFileSystem::ReadDirectory(TRemoteFileList * FileList)
         {
           std::unique_ptr<TRemoteFile> AFile(LoadFile(&ListingPacket, NULL, L"", FileList));
           TRemoteFile * File = AFile.get();
-          if (FTerminal->IsValidFile(File))
+          if (FTerminal->IsValidFile(File) && FileList->AddFile(AFile.release()))
           {
-            FileList->AddFile(AFile.release());
             if (FTerminal->IsEncryptingFiles() && // optimization
                 IsRealFile(File->FileName))
             {