paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 07:09:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Some improvements as proposed by Alexey Torgashin

Browse Source
This commit is contained in:
Michaël Van Canneyt 2022-11-23 12:55:03 +01:00
parent d9f5c47d2a
commit 00dc793097
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
packages/fcl-base/src/chainstream.pp
View File

@ -45,6 +45,7 @@ Type
FOwnsStreams: Boolean; FOwnsStreams: Boolean;
function GetStream(aIndex : Integer): TStream; function GetStream(aIndex : Integer): TStream;
function GetStreamCount: Integer; function GetStreamCount: Integer;
function IsValidStreamIndex(aIndex: Integer): Boolean;
Protected Protected
Function CurrentStream : TStream; Function CurrentStream : TStream;
Function StreamSize : Int64; Function StreamSize : Int64;
@ -74,16 +75,22 @@ begin
Result:=Length(FStreams); Result:=Length(FStreams);
end; end;
function TChainedStream.IsValidStreamIndex(aIndex : Integer) : Boolean;
begin
Result:=(aIndex>=0) and (aIndex<Length(FStreams));
end;
function TChainedStream.GetStream(aIndex : Integer): TStream; function TChainedStream.GetStream(aIndex : Integer): TStream;
begin begin
if (aIndex<0) or (aIndex>=Length(FStreams)) then if not IsValidStreamIndex(aIndex) then
Raise EListError.CreateFmt(SListIndexError,[aIndex]); Raise EListError.CreateFmt(SListIndexError,[aIndex]);
Result:=FStreams[aIndex].Stream; Result:=FStreams[aIndex].Stream;
end; end;
function TChainedStream.CurrentStream: TStream; function TChainedStream.CurrentStream: TStream;
begin begin
if FCurrentStreamIdx<Length(FStreams) then if IsValidStreamIndex(FCurrentStreamIdx) then
Result:=FStreams[FCurrentStreamIdx].Stream Result:=FStreams[FCurrentStreamIdx].Stream
else else
Result:=Nil; Result:=Nil;
@ -91,7 +98,7 @@ end;
function TChainedStream.StreamSize: Int64; function TChainedStream.StreamSize: Int64;
begin begin
if FCurrentStreamIdx<Length(FStreams) then if IsValidStreamIndex(FCurrentStreamIdx) then
begin begin
if FStreams[FCurrentStreamIdx].Size=-1 then if FStreams[FCurrentStreamIdx].Size=-1 then
FStreams[FCurrentStreamIdx].Size:=FStreams[FCurrentStreamIdx].Stream.Size; FStreams[FCurrentStreamIdx].Size:=FStreams[FCurrentStreamIdx].Stream.Size;
@ -104,13 +111,13 @@ end;
function TChainedStream.NextStream: Boolean; function TChainedStream.NextStream: Boolean;
begin begin
Inc(FCurrentStreamIdx); Inc(FCurrentStreamIdx);
Result:=FCurrentStreamIdx<Length(FStreams); Result:=IsValidStreamIndex(FCurrentStreamIdx);
end; end;
function TChainedStream.PrevStream: Boolean; function TChainedStream.PrevStream: Boolean;
begin begin
Dec(FCurrentStreamIdx); Dec(FCurrentStreamIdx);
Result:=FCurrentStreamIdx>=0; Result:=IsValidStreamIndex(FCurrentStreamIdx);
end; end;
function TChainedStream.GetTotalSize: Int64; function TChainedStream.GetTotalSize: Int64;
@ -228,19 +235,25 @@ Var
Procedure MoveForward(aStartPos : Int64; aOrigin : TSeekOrigin); Procedure MoveForward(aStartPos : Int64; aOrigin : TSeekOrigin);
var
aSize : Int64;
begin begin
while (aOff>StreamSize-aStartPos) do aSize:=StreamSize;
while (aOff>aSize-aStartPos) do
begin begin
Dec(aOff,StreamSize-aStartPos); Dec(aOff,aSize-aStartPos);
Inc(FPosition,StreamSize-aStartPos); Inc(FPosition,aSize-aStartPos);
if not NextStream then if not NextStream then
Break; Break;
aStartPos:=0; aStartPos:=0;
aSize:=StreamSize;
end; end;
if CurrentStream=Nil then if CurrentStream=Nil then
FCurrentStreamIdx:=Length(FStreams)-1; FCurrentStreamIdx:=Length(FStreams)-1;
if aOff>StreamSize then aSize:=StreamSize;
aOff:=StreamSize; if aOff>aSize then
aOff:=aSize;
inc(FPosition,aOff); inc(FPosition,aOff);
Result:=FPosition; Result:=FPosition;
CurrentStream.Seek(aOff,aOrigin); CurrentStream.Seek(aOff,aOrigin);

2
packages/fcl-base/tests/utcchainstream.pp
View File

@ -66,8 +66,10 @@ Var
aSize : Word; aSize : Word;
begin begin
AssertTrue('Must have at least one stream size',Length(Sizes)>0);
ClearStreams; ClearStreams;
SetLength(FStreams,Length(Sizes)); SetLength(FStreams,Length(Sizes));
For I:=0 to Length(FStreams)-1 do For I:=0 to Length(FStreams)-1 do
begin begin
aSize:=Sizes[i]; aSize:=Sizes[i];