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

* fix for 3357, introducing some local vars.

Browse Source
This commit is contained in:
marco 2004-11-05 12:10:04 +00:00
parent aa23d79073
commit 55e845aa5e
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,23 +96,25 @@ end ;
Function TryEncodeDate(Year,Month,Day : Word; Var Date : TDateTime) : Boolean; Function TryEncodeDate(Year,Month,Day : Word; Var Date : TDateTime) : Boolean;
var var
c, ya: cardinal; lm,ly, c, ya: cardinal;
begin begin
Result:=(Year>0) and (Year<10000) and Result:=(Year>0) and (Year<10000) and
(Month in [1..12]) and (Month in [1..12]) and
(Day>0) and (Day<=MonthDays[IsleapYear(Year),Month]); (Day>0) and (Day<=MonthDays[IsleapYear(Year),Month]);
If Result then If Result then
begin begin
if month > 2 then lm:=month;
Dec(Month,3) ly:=year;
if lm > 2 then
Dec(lm,3)
else else
begin begin
Inc(Month,9); Inc(lm,9);
Dec(Year); Dec(ly);
end; end;
c:= Year DIV 100; c:= ly DIV 100;
ya:= Year - 100*c; ya:= ly - 100*c;
Date := (146097*c) SHR 2 + (1461*ya) SHR 2 + (153*cardinal(Month)+2) DIV 5 + cardinal(Day) - 693900; Date := (146097*c) SHR 2 + (1461*ya) SHR 2 + (153*cardinal(lm)+2) DIV 5 + cardinal(Day) - 693900;
end end
end; end;
@ -737,7 +739,10 @@ end;
{ {
$Log$ $Log$
Revision 1.3 2004-05-02 13:40:55 marco Revision 1.4 2004-11-05 12:10:04 marco
* fix for 3357, introducing some local vars.
Revision 1.3 2004/05/02 13:40:55 marco
* fix to AM/PM behaviour of formatdatetime around noon * fix to AM/PM behaviour of formatdatetime around noon
Revision 1.2 2003/11/24 23:00:56 michael Revision 1.2 2003/11/24 23:00:56 michael