mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-04-28 06:00:35 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1898 from schuetzm/tzif3

Browse source 
Support TZif format v3
This commit is contained in:
Jonathan M Davis 2014-02-05 04:32:10 -08:00
commit 0b066c74f5
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
std/datetime.d
View file

@ -29319,7 +29319,7 @@ assert(tz.dstName == "PDT");
_enforceValidTZFile(readVal!(char[])(tzFile, 4) == "TZif"); _enforceValidTZFile(readVal!(char[])(tzFile, 4) == "TZif");
immutable char tzFileVersion = readVal!char(tzFile); immutable char tzFileVersion = readVal!char(tzFile);
_enforceValidTZFile(tzFileVersion == '\0' || tzFileVersion == '2'); _enforceValidTZFile(tzFileVersion == '\0' || tzFileVersion == '2' || tzFileVersion == '3');
{ {
auto zeroBlock = readVal!(ubyte[])(tzFile, 15); auto zeroBlock = readVal!(ubyte[])(tzFile, 15);
@ -29403,12 +29403,13 @@ assert(tz.dstName == "PDT");
_enforceValidTZFile(!tzFile.eof); _enforceValidTZFile(!tzFile.eof);
//If version 2, the information is duplicated in 64-bit. //If version 2 or 3, the information is duplicated in 64-bit.
if(tzFileVersion == '2') if(tzFileVersion == '2' || tzFileVersion == '3')
{ {
_enforceValidTZFile(readVal!(char[])(tzFile, 4) == "TZif"); _enforceValidTZFile(readVal!(char[])(tzFile, 4) == "TZif");
_enforceValidTZFile(readVal!(char)(tzFile) == '2'); immutable char tzFileVersion2 = readVal!(char)(tzFile);
_enforceValidTZFile(tzFileVersion2 == '2' || tzFileVersion2 == '3');
{ {
auto zeroBlock = readVal!(ubyte[])(tzFile, 15); auto zeroBlock = readVal!(ubyte[])(tzFile, 15);