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

* Removed redundant assignments to result in UniversalTimeToLocal and LocalTimeToUniversal, Mantis #24582.

Browse Source 
git-svn-id: trunk@24884 -
This commit is contained in:
sergei 2013-06-12 14:33:23 +00:00
parent 812efbad13
commit 6cb66faffe
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rtl/objpas/dateutil.inc
View File

@ -2466,13 +2466,12 @@ end;
function UniversalTimeToLocal(UT: TDateTime; TZOffset : Integer): TDateTime;
begin
Result := UT;
if (TZOffset > 0) then
Result := UT - EncodeTime(TZOffset div 60, TZOffset mod 60, 0, 0)
else if (TZOffset = 0) then
Result := UT
else if (TZOffset < 0) then
Result := UT + EncodeTime(Abs(TZOffset) div 60, Abs(TZOffset) mod 60, 0, 0);
Result := UT + EncodeTime(Abs(TZOffset) div 60, Abs(TZOffset) mod 60, 0, 0)
else
Result := UT;
end;
Function LocalTimeToUniversal(LT: TDateTime): TDateTime;
@ -2484,13 +2483,12 @@ end;
Function LocalTimeToUniversal(LT: TDateTime;TZOffset: Integer): TDateTime;
begin
Result := LT;
if (TZOffset > 0) then
Result := LT + EncodeTime(TZOffset div 60, TZOffset mod 60, 0, 0)
else if (TZOffset = 0) then
Result := LT
else if (TZOffset < 0) then
Result := LT - EncodeTime(Abs(TZOffset) div 60, Abs(TZOffset) mod 60, 0, 0);
Result := LT - EncodeTime(Abs(TZOffset) div 60, Abs(TZOffset) mod 60, 0, 0)
else
Result := LT;
end;
{$else}