sysutils/winscp
1
0
Fork 0
mirror of https://github.com/winscp/winscp.git synced 2026-10-24 02:28:55 +03:00
Code Activity

Simplifying TFileBuffer interface and implementation

Browse Source 
Source commit: 21e313288097378f7f473ae737755912cedf5188
This commit is contained in:
Martin Prikryl
2023-06-15 11:40:32 +00:00
parent 265ae0ba49
commit 233ee20502
3 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/core/FileBuffer.cpp
View File

@@ -39,23 +39,9 @@ void __fastcall TFileBuffer::SetSize(int value)
}
}
//---------------------------------------------------------------------------
void __fastcall TFileBuffer::SetPosition(int value)
void TFileBuffer::Reset()
{
FMemory->Position = value;
}
//---------------------------------------------------------------------------
int __fastcall TFileBuffer::GetPosition() const
{
return (int)FMemory->Position;
}
//---------------------------------------------------------------------------
void __fastcall TFileBuffer::SetMemory(TMemoryStream * value)
{
if (FMemory != value)
{
if (FMemory) delete FMemory;
FMemory = value;
}
FMemory->Position = 0;
}
//---------------------------------------------------------------------------
void __fastcall TFileBuffer::ProcessRead(DWORD Len, DWORD Result)
@@ -67,22 +53,27 @@ void __fastcall TFileBuffer::ProcessRead(DWORD Len, DWORD Result)
FMemory->Seek(Result, soCurrent);
}
//---------------------------------------------------------------------------
void TFileBuffer::NeedSpace(DWORD Size)
{
Size = GetPosition() + Size;
}
//---------------------------------------------------------------------------
DWORD __fastcall TFileBuffer::ReadStream(TStream * Stream, const DWORD Len, bool ForceLen)
{
DWORD Result;
try
{
Size = Position + Len;
NeedSpace(Len);
// C++5
// FMemory->SetSize(FMemory->Position + Len);
if (ForceLen)
{
Stream->ReadBuffer(Data + Position, Len);
Stream->ReadBuffer(GetPointer(), Len);
Result = Len;
}
else
{
Result = Stream->Read(Data + Position, Len);
Result = Stream->Read(GetPointer(), Len);
}
ProcessRead(Len, Result);
}
@@ -102,9 +93,9 @@ DWORD __fastcall TFileBuffer::LoadStream(TStream * Stream, const DWORD Len, bool
DWORD __fastcall TFileBuffer::LoadFromIn(TTransferInEvent OnTransferIn, TObject * Sender, DWORD Len)
{
FMemory->Seek(0, soFromBeginning);
DebugAssert(Position == 0);
Size = Position + Len;
size_t Result = OnTransferIn(Sender, reinterpret_cast<unsigned char *>(Data) + Position, Len);
DebugAssert(GetPosition() == 0);
NeedSpace(Len);
size_t Result = OnTransferIn(Sender, reinterpret_cast<unsigned char *>(GetPointer()), Len);
ProcessRead(Len, Result);
return Result;
}
@@ -240,7 +231,7 @@ void __fastcall TFileBuffer::WriteToStream(TStream * Stream, const DWORD Len)
{
try
{
Stream->WriteBuffer(Data + Position, Len);
Stream->WriteBuffer(GetPointer(), Len);
FMemory->Seek(Len, soCurrent);
}
catch(EWriteError &)
@@ -251,7 +242,7 @@ void __fastcall TFileBuffer::WriteToStream(TStream * Stream, const DWORD Len)
//---------------------------------------------------------------------------
void __fastcall TFileBuffer::WriteToOut(TTransferOutEvent OnTransferOut, TObject * Sender, const DWORD Len)
{
OnTransferOut(Sender, reinterpret_cast<const unsigned char *>(Data) + Position, Len);
OnTransferOut(Sender, reinterpret_cast<const unsigned char *>(GetPointer()), Len);
FMemory->Seek(Len, soCurrent);
}
//---------------------------------------------------------------------------

10
source/core/FileBuffer.h
View File

@@ -28,20 +28,20 @@ public:
DWORD __fastcall LoadFromIn(TTransferInEvent OnTransferIn, TObject * Sender, DWORD Len);
void __fastcall WriteToStream(TStream * Stream, const DWORD Len);
void __fastcall WriteToOut(TTransferOutEvent OnTransferOut, TObject * Sender, const DWORD Len);
__property TMemoryStream * Memory = { read=FMemory, write=SetMemory };
void Reset();
__property TMemoryStream * Memory = { read=FMemory };
__property char * Data = { read=GetData };
__property int Size = { read=FSize, write=SetSize };
__property int Position = { read=GetPosition, write=SetPosition };
private:
TMemoryStream * FMemory;
int FSize;
void __fastcall SetMemory(TMemoryStream * value);
char * __fastcall GetData() const { return (char *)FMemory->Memory; }
char * __fastcall GetPointer() const { return GetData() + GetPosition(); }
void NeedSpace(DWORD Size);
void __fastcall SetSize(int value);
void __fastcall SetPosition(int value);
int __fastcall GetPosition() const;
int __fastcall GetPosition() const { return (int)FMemory->Position; }
void __fastcall ProcessRead(DWORD Len, DWORD Result);
};
//---------------------------------------------------------------------------

2
source/core/ScpFileSystem.cpp
View File

@@ -2716,7 +2716,7 @@ void __fastcall TSCPFileSystem::SCPSink(const UnicodeString TargetDir,
do
{
BlockBuf.Size = OperationProgress->TransferBlockSize();
BlockBuf.Position = 0;
BlockBuf.Reset();
FSecureShell->Receive(reinterpret_cast<unsigned char *>(BlockBuf.Data), BlockBuf.Size);
OperationProgress->AddTransferred(BlockBuf.Size);