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

Merge branch 'ZeroSeparators' into 'main'

Browse Source 
DateTimeToString: do not write #0 separators

See merge request freepascal.org/fpc/source!5
This commit is contained in:
Michael Van Canneyt 2021-08-11 12:22:54 +00:00
commit 5221388659
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/objpas/sysutils/dati.inc
View File

@ -1089,8 +1089,8 @@ var
else else
raise EConvertError.Create('Illegal character in format string'); raise EConvertError.Create('Illegal character in format string');
end ; end ;
'/': StoreStr(@FormatSettings.DateSeparator, 1); '/': if FormatSettings.DateSeparator<>#0 then StoreStr(@FormatSettings.DateSeparator, 1);
':': StoreStr(@FormatSettings.TimeSeparator, 1); ':': if FormatSettings.TimeSeparator<>#0 then StoreStr(@FormatSettings.TimeSeparator, 1);
'[': if (fdoInterval in Options) then isInterval := true else StoreStr(FormatCurrent, 1); '[': if (fdoInterval in Options) then isInterval := true else StoreStr(FormatCurrent, 1);
']': if (fdoInterval in Options) then isInterval := false else StoreStr(FormatCurrent, 1); ']': if (fdoInterval in Options) then isInterval := false else StoreStr(FormatCurrent, 1);
' ', 'C', 'D', 'H', 'M', 'N', 'S', 'T', 'Y', 'Z', 'F' {$IFDEF MSWindows}, 'G', 'E'{$ENDIF MSWindows} : ' ', 'C', 'D', 'H', 'M', 'N', 'S', 'T', 'Y', 'Z', 'F' {$IFDEF MSWindows}, 'G', 'E'{$ENDIF MSWindows} :