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

* fix for Mantis #38023: the code to convert LF to CRLF when converting to UTF-8 is disabled anyway, so disable unnecessary, duplicate if-branches as well

Browse Source 
git-svn-id: trunk@47284 -
This commit is contained in:
svenbarth 2020-11-02 16:42:32 +00:00
parent 6ed331d6e7
commit c2454d5386
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtl/inc/ustrings.inc
View File

@ -1833,9 +1833,9 @@ end;
if (IBYTE and $80) = 0 then if (IBYTE and $80) = 0 then
begin begin
//One character US-ASCII, convert it to unicode //One character US-ASCII, convert it to unicode
(*
if IBYTE = 10 then if IBYTE = 10 then
begin begin
(*
If (PreChar<>13) and FALSE then If (PreChar<>13) and FALSE then
begin begin
//Expand to crlf, conform UTF-8. //Expand to crlf, conform UTF-8.
@ -1856,7 +1856,6 @@ end;
end; end;
end end
else else
*)
begin begin
Dest[OutputUnicode]:=WideChar(IBYTE); Dest[OutputUnicode]:=WideChar(IBYTE);
inc(OutputUnicode); inc(OutputUnicode);
@ -1864,6 +1863,7 @@ end;
end; end;
end end
else else
*)
begin begin
Dest[OutputUnicode]:=WideChar(IBYTE); Dest[OutputUnicode]:=WideChar(IBYTE);
inc(OutputUnicode); inc(OutputUnicode);
@ -1978,9 +1978,9 @@ end;
if (IBYTE and $80) = 0 then if (IBYTE and $80) = 0 then
begin begin
//One character US-ASCII, convert it to unicode //One character US-ASCII, convert it to unicode
(*
if IBYTE = 10 then if IBYTE = 10 then
begin begin
(*
if (PreChar<>13) and FALSE then if (PreChar<>13) and FALSE then
begin begin
//Expand to crlf, conform UTF-8. //Expand to crlf, conform UTF-8.
@ -1990,13 +1990,13 @@ end;
PreChar:=10; PreChar:=10;
end end
else else
*)
begin begin
inc(OutputUnicode); inc(OutputUnicode);
PreChar:=IBYTE; PreChar:=IBYTE;
end; end;
end end
else else
*)
begin begin
inc(OutputUnicode); inc(OutputUnicode);
PreChar:=IBYTE; PreChar:=IBYTE;