paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-22 11:49:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Changed CompareMem to CompareMemRange and added new (Delphi compatible)

Browse Source 
CompareMem. (CompareMem needs a Boolean as result type, not Integer)
This commit is contained in:
sg 2000-05-08 17:03:02 +00:00
parent e54b99663e
commit 0f23f58148
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
rtl/objpas/sysstr.inc
View File

@ -104,20 +104,20 @@ Count1 := Length(S1);
Count2 := Length(S2);
if Count1 > Count2 then Count := Count2
else Count := Count1;
result := CompareMem(Pointer(S1),Pointer(S2), Count);
result := CompareMemRange(Pointer(S1),Pointer(S2), Count);
if (result = 0) and (Count1 <> Count2) then begin
if Count1 > Count2 then result := ord(s1[Count1 + 1])
else result := -ord(s2[Count2 + 1]);
end ;
end ;
{ CompareMem returns the result of comparison of Length bytes at P1 and P2
{ CompareMemRange returns the result of comparison of Length bytes at P1 and P2
case result
P1 < P2 < 0
P1 > P2 > 0
P1 = P2 = 0 }
function CompareMem(P1, P2: Pointer; Length: cardinal): integer;
function CompareMemRange(P1, P2: Pointer; Length: cardinal): integer;
var i: integer;
begin
i := 0;
@ -130,6 +130,24 @@ while (result = 0) and (i < length) do begin
end ;
end ;
function CompareMem(P1, P2: Pointer; Length: cardinal): Boolean;
var
i: Integer;
begin
for i := 0 to Length - 1 do
begin
if Byte(P1^) <> Byte(P2^) then
begin
Result := False;
exit;
end;
Inc(P1);
Inc(P2);
end;
Result := True;
end;
{ CompareText compares S1 and S2, the result is the based on
substraction of the ascii values of characters in S1 and S2
comparison is case-insensitive
@ -1157,7 +1175,11 @@ const
{
$Log$
Revision 1.33 2000-05-08 13:26:42 peter
Revision 1.34 2000-05-08 17:03:02 sg
* Changed CompareMem to CompareMemRange and added new (Delphi compatible)
CompareMem. (CompareMem needs a Boolean as result type, not Integer)
Revision 1.33 2000/05/08 13:26:42 peter
* vtchar support for %s
* define debug -> define fmtdebug

9
rtl/objpas/sysstrh.inc
View File

@ -39,7 +39,8 @@ procedure AppendStr(var Dest: String; const S: string);
function UpperCase(const s: string): string;
function LowerCase(const s: string): string;
function CompareStr(const S1, S2: string): Integer;
function CompareMem(P1, P2: Pointer; Length: cardinal): integer;
function CompareMemRange(P1, P2: Pointer; Length: cardinal): integer;
function CompareMem(P1, P2: Pointer; Length: cardinal): Boolean;
function CompareText(const S1, S2: string): integer;
function AnsiUpperCase(const s: string): string;
@ -93,7 +94,11 @@ function BCDToInt(Value: integer): integer;
{
$Log$
Revision 1.9 2000-02-09 16:59:33 peter
Revision 1.10 2000-05-08 17:03:02 sg
* Changed CompareMem to CompareMemRange and added new (Delphi compatible)
CompareMem. (CompareMem needs a Boolean as result type, not Integer)
Revision 1.9 2000/02/09 16:59:33 peter
* truncated log
}