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

* Patch from Laco with cosmetic changes and warning-removing

Browse Source 
git-svn-id: trunk@45188 -
This commit is contained in:
michael 2020-04-30 07:01:44 +00:00
parent 9b1eebd333
commit c66ceaf0e3
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,17 +101,17 @@ type
); );
// Extract program version information in 1 call. // Extract program version information in 1 call.
Function GetProgramVersion (Var Version : TVersionQuad) : Boolean; Function GetProgramVersion (Out Version : TVersionQuad) : Boolean;
Function GetProgramVersion (Var Version : TProgramVersion) : Boolean; Function GetProgramVersion (Out Version : TProgramVersion) : Boolean;
// Compare 2 versions // Compare 2 versions
Function CompareVersionQuads(Quad1,Quad2 : TVersionQuad) : TVersionCompare; Function CompareVersionQuads(Quad1,Quad2 : TVersionQuad) : TVersionCompare;
Function CompareProgramVersion(Version1,Version2 : TProgramVersion) : TVersionCompare; Function CompareProgramVersion(Version1,Version2 : TProgramVersion) : TVersionCompare;
// Convert version quad to string // Convert version quad to string
Function VersionQuadToStr(Const Quad : TVersionQuad) : String; Function VersionQuadToStr(Const Quad : TVersionQuad) : String;
Function ProgramversionToStr(Const Version : TProgramVersion) : String; Function ProgramVersionToStr(Const Version : TProgramVersion) : String;
// Try to convert string to version quad. // Try to convert string to version quad.
Function TryStrToVersionQuad(S : String; Var Quad : TVersionQuad) : Boolean; Function TryStrToVersionQuad(S : String; Out Quad : TVersionQuad) : Boolean;
Function TryStrToProgramVersion(S : String; Var Version : TProgramVersion) : Boolean; Function TryStrToProgramVersion(S : String; Out Version : TProgramVersion) : Boolean;
// Convert string to version quad, raise exception if invalid string. // Convert string to version quad, raise exception if invalid string.
Function StrToVersionQuad(Const S : String) : TVersionQuad; Function StrToVersionQuad(Const S : String) : TVersionQuad;
Function StrToProgramVersion(Const S : String ): TProgramVersion; Function StrToProgramVersion(Const S : String ): TProgramVersion;
@ -183,7 +183,7 @@ end;
procedure TVersionInfo.Load(Const AFileName : String); procedure TVersionInfo.Load(Const AFileName : String);
Var Var
I : Integer; I : LongWord;
begin begin
FreeResources; FreeResources;
@ -265,8 +265,7 @@ procedure TFileVersionInfo.ReadFileInfo;
Var Var
VI : TVersionInfo; VI : TVersionInfo;
ST : TVersionStringTable; ST : TVersionStringTable;
TI,I,J : Integer; TI,I : Integer;
S: String;
begin begin
FEnabled:=True; FEnabled:=True;
@ -304,9 +303,9 @@ begin
end; end;
end; end;
ST:=VI.StringFileInfo.Items[Ti]; ST:=VI.StringFileInfo.Items[Ti];
for J:=0 to ST.Count-1 do for i:=0 to ST.Count-1 do
if (FFilter.Count=0) or (FFilter.IndexOf(ST.Keys[j])<>-1) then if (FFilter.Count=0) or (FFilter.IndexOf(ST.Keys[i])<>-1) then
FVersionStrings.Add(ST.Keys[j]+'='+ST.Values[j]); FVersionStrings.Add(ST.Keys[i]+'='+ST.Values[i]);
finally finally
FreeAndNil(VI); FreeAndNil(VI);
end; end;
@ -347,7 +346,7 @@ end;
{ Convenience function } { Convenience function }
Function GetProgramVersion (Var Version : TVersionQuad) : Boolean; Function GetProgramVersion (Out Version : TVersionQuad) : Boolean;
Var Var
VI : TVersionInfo; VI : TVersionInfo;
@ -370,7 +369,7 @@ begin
end; end;
end; end;
Function GetProgramVersion (Var Version : TProgramVersion) : Boolean; Function GetProgramVersion (Out Version : TProgramVersion) : Boolean;
Var Var
VQ : TVersionQuad; VQ : TVersionQuad;
begin begin
@ -435,7 +434,7 @@ begin
Result:=Format('%d.%d.%d.%d',[Version.Major,Version.Minor,Version.Revision,Version.Build]); Result:=Format('%d.%d.%d.%d',[Version.Major,Version.Minor,Version.Revision,Version.Build]);
end; end;
Function TryStrToProgramVersion(S : String; Var Version : TProgramVersion) : Boolean; Function TryStrToProgramVersion(S : String; Out Version : TProgramVersion) : Boolean;
Var Var
Q : TVersionQuad; Q : TVersionQuad;
@ -445,7 +444,7 @@ begin
Version:=Q; Version:=Q;
end; end;
Function TryStrToVersionQuad(S : String; Var Quad : TVersionQuad) : Boolean; Function TryStrToVersionQuad(S : String; Out Quad : TVersionQuad) : Boolean;
Var Var
I,P,Dots,Q : Integer; I,P,Dots,Q : Integer;
@ -488,12 +487,12 @@ end;
Function NewerVersion(V1,V2 : TProgramVersion) : Boolean; Function NewerVersion(V1,V2 : TProgramVersion) : Boolean;
Var Var
Q1,Q2 : TversionQuad; Q1,Q2 : TVersionQuad;
begin begin
Q1:=V1; Q1:=V1;
Q2:=V2; Q2:=V2;
Result:=Newerversion(Q1,Q2); Result:=NewerVersion(Q1,Q2);
end; end;
Function NewerVersion(Q1,Q2 : TVersionQuad) : Boolean; Function NewerVersion(Q1,Q2 : TVersionQuad) : Boolean;