paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-01 13:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

* check zero length instead of comparing to empty string

Browse Source
This commit is contained in:
Michael VAN CANNEYT 2023-01-06 12:06:05 +01:00 committed by Michaël Van Canneyt
parent f04577d292
commit 3aefada11a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rtl/inc/wstrings.inc
View File

@ -96,7 +96,7 @@ begin
begin begin
PWideRec(P)^.Len:=Len*2; { Initial length } PWideRec(P)^.Len:=Len*2; { Initial length }
PWideRec(P)^.First:=#0; { Terminating #0 } PWideRec(P)^.First:=#0; { Terminating #0 }
inc(p,WideFirstOff); { Points to string now } inc(p,WideFirstOff); { Points to widestring now }
end end
else else
WideStringError; WideStringError;
@ -108,7 +108,7 @@ end;
Procedure fpc_WideStr_Decr_Ref (Var S : Pointer);[Public,Alias:'FPC_WIDESTR_DECR_REF']; compilerproc; Procedure fpc_WideStr_Decr_Ref (Var S : Pointer);[Public,Alias:'FPC_WIDESTR_DECR_REF']; compilerproc;
{ {
Decreases the ReferenceCount of a non constant widestring; Decreases the ReferenceCount of a non constant widestring;
If the reference count is zero, deallocate the string; If the reference count is zero, deallocate the widestring;
} }
Begin Begin
If S=Nil then If S=Nil then
@ -268,12 +268,12 @@ Var
same : boolean; same : boolean;
begin begin
{ only assign if s1 or s2 is empty } { only assign if s1 or s2 is empty }
if (S1='') then if Length(S1)=0 then
begin begin
DestS:=s2; DestS:=s2;
exit; exit;
end; end;
if (S2='') then if Length(S2)=0 then
begin begin
DestS:=s1; DestS:=s1;
exit; exit;
@ -491,7 +491,7 @@ end;
Procedure fpc_WideStr_SetLength(Var S : WideString; l : SizeInt);[Public,Alias : 'FPC_WIDESTR_SETLENGTH']; compilerproc; Procedure fpc_WideStr_SetLength(Var S : WideString; l : SizeInt);[Public,Alias : 'FPC_WIDESTR_SETLENGTH']; compilerproc;
{ {
Sets The length of string S to L. Sets The length of WideString S to L.
Makes sure S is unique, and contains enough room. Makes sure S is unique, and contains enough room.
} }
Var Var
@ -502,7 +502,7 @@ begin
begin begin
if Pointer(S)=nil then if Pointer(S)=nil then
begin begin
{ Need a complete new string...} { Need a complete new widestring...}
Pointer(s):=NewWideString(l); Pointer(s):=NewWideString(l);
end end
{ windows doesn't support reallocing widestrings, this code { windows doesn't support reallocing widestrings, this code
@ -544,7 +544,7 @@ begin
{$endif MSWINDOWS} {$endif MSWINDOWS}
PWideRec(Pointer(S)-WideFirstOff)^.Len:=l*sizeof(WideChar); PWideRec(Pointer(S)-WideFirstOff)^.Len:=l*sizeof(WideChar);
end end
else // length=0, deallocate the string else // length=0, deallocate the widestring
fpc_widestr_decr_ref (Pointer(S)); fpc_widestr_decr_ref (Pointer(S));
end; end;
@ -948,7 +948,7 @@ function UTF8Encode(const s : WideString) : RawByteString;
hs : UTF8String; hs : UTF8String;
begin begin
result:=''; result:='';
if s='' then if Length(s)=0 then
exit; exit;
SetLength(hs,length(s)*3); SetLength(hs,length(s)*3);
i:=UnicodeToUtf8(pansichar(hs),length(hs)+1,PWideChar(s),length(s)); i:=UnicodeToUtf8(pansichar(hs),length(hs)+1,PWideChar(s),length(s));