Skip to content

Commit bd064fa

Browse files
committed
remove unneeded GetHashCode in THashResult
1 parent 9a03a54 commit bd064fa

File tree

3 files changed

+1
-78
lines changed

3 files changed

+1
-78
lines changed

HashLib/src/Base/HlpHashResult.pas

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,6 @@ interface
66

77
uses
88
SysUtils,
9-
{$IFDEF FPC}
10-
base64,
11-
{$ELSE}
12-
{$IFDEF HAS_DELPHI_NET_ENCODING}
13-
System.NetEncoding,
14-
{$ELSE}
15-
Classes,
16-
EncdDecd,
17-
{$ENDIF HAS_DELPHI_NET_ENCODING}
18-
{$ENDIF FPC}
199
HlpBits,
2010
HlpHashLibTypes,
2111
HlpIHashResult,
@@ -49,8 +39,6 @@ THashResult = class sealed(TInterfacedObject, IHashResult)
4939
function GetUInt64(): UInt64;
5040
function ToString(AGroup: Boolean = False): String; reintroduce;
5141
function Equals(const AHashResult: IHashResult): Boolean; reintroduce;
52-
function GetHashCode(): {$IFDEF DELPHI}Int32; {$ELSE}PtrInt;
53-
{$ENDIF DELPHI}override;
5442

5543
end;
5644

@@ -107,68 +95,6 @@ function THashResult.GetBytes: THashLibByteArray;
10795
result := FHash;
10896
end;
10997

110-
function THashResult.GetHashCode: {$IFDEF DELPHI}Int32; {$ELSE}PtrInt;
111-
{$ENDIF DELPHI}
112-
113-
var
114-
LResult: UInt32;
115-
LIdx, LTop: Int32;
116-
LTemp: String;
117-
{$IFDEF HAS_DELPHI_NET_ENCODING}
118-
LTempHolder: THashLibByteArray;
119-
{$ELSE}
120-
{$IFDEF DELPHI}
121-
LTempHolder: TBytesStream;
122-
{$ENDIF DELPHI}
123-
{$ENDIF HAS_DELPHI_NET_ENCODING}
124-
{$IFDEF FPC}
125-
LTempHolder: String;
126-
{$ENDIF FPC}
127-
begin
128-
129-
{$IFDEF HAS_DELPHI_NET_ENCODING}
130-
LTempHolder := Self.FHash;
131-
{$ELSE}
132-
{$IFDEF DELPHI}
133-
LTempHolder := TBytesStream.Create(Self.FHash);
134-
{$ENDIF DELPHI}
135-
{$ENDIF HAS_DELPHI_NET_ENCODING}
136-
{$IFDEF FPC}
137-
LTempHolder := EncodeStringBase64(TConverters.ConvertBytesToString(Self.FHash,
138-
TEncoding.UTF8));
139-
{$ENDIF FPC}
140-
{$IFDEF HAS_DELPHI_NET_ENCODING}
141-
LTemp := StringReplace(TNetEncoding.base64.EncodeBytesToString(LTempHolder),
142-
sLineBreak, '', [rfReplaceAll]);
143-
{$ELSE}
144-
{$IFDEF DELPHI}
145-
try
146-
LTemp := StringReplace(String(EncodeBase64(LTempHolder.Memory,
147-
LTempHolder.Size)), sLineBreak, '', [rfReplaceAll]);
148-
finally
149-
LTempHolder.Free;
150-
end;
151-
{$ENDIF DELPHI}
152-
{$ENDIF HAS_DELPHI_NET_ENCODING}
153-
{$IFDEF FPC}
154-
LTemp := LTempHolder;
155-
{$ENDIF FPC}
156-
LTemp := AnsiUpperCase(LTemp);
157-
158-
LResult := 0;
159-
LIdx := 1;
160-
LTop := System.Length(LTemp);
161-
162-
while LIdx <= LTop do
163-
begin
164-
LResult := TBits.RotateLeft32(LResult, 5);
165-
LResult := LResult xor UInt32(LTemp[LIdx]);
166-
System.Inc(LIdx);
167-
end;
168-
169-
result := LResult;
170-
end;
171-
17298
function THashResult.GetInt32: Int32;
17399
begin
174100
if System.Length(FHash) <> sizeof(Int32) then

HashLib/src/Interfaces/HlpIHashResult.pas

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ interface
1919
function GetUInt64(): UInt64;
2020
function ToString(AGroup: Boolean = False): String;
2121
function Equals(const AHashResult: IHashResult): Boolean; overload;
22-
function GetHashCode(): {$IFDEF DELPHI}Int32; {$ELSE}PtrInt;
23-
{$ENDIF DELPHI}
2422
end;
2523

2624
implementation

HashLib/src/Packages/Delphi/HashLib4PascalPackage.dpk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ package HashLib4PascalPackage;
3232
{$IMPLICITBUILD ON}
3333

3434
requires
35-
rtl,
36-
soaprtl;
35+
rtl;
3736

3837
contains
3938
HlpHash in '..\..\Base\HlpHash.pas',

0 commit comments

Comments
 (0)