steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tzinfo: simplify magic check.

db4
John Benediktsson 2013-11-26 14:33:49 -08:00
parent 3eced27aee
commit 2922b1a943
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
extra/tzinfo/tzinfo.factor
View File

@ -11,7 +11,6 @@ IN: tzinfo
<PRIVATE <PRIVATE
STRUCT: tzhead STRUCT: tzhead
{ tzh_magic char[4] }
{ tzh_reserved char[16] } { tzh_reserved char[16] }
{ tzh_ttisgmtcnt be32 } { tzh_ttisgmtcnt be32 }
{ tzh_ttisstdcnt be32 } { tzh_ttisstdcnt be32 }
@ -27,8 +26,8 @@ PACKED-STRUCT: ttinfo
ERROR: bad-magic ; ERROR: bad-magic ;
: check-magic ( header -- header ) : check-magic ( -- )
dup tzh_magic>> "TZif" sequence= [ bad-magic ] unless ; 4 read "TZif" sequence= [ bad-magic ] unless ;
TUPLE: tzfile header transition-times local-times types abbrevs TUPLE: tzfile header transition-times local-times types abbrevs
leaps is-std is-gmt ; leaps is-std is-gmt ;
@ -39,7 +38,7 @@ C: <tzfile> tzfile
4 read be32 deref ; 4 read be32 deref ;
: read-tzfile ( -- tzfile ) : read-tzfile ( -- tzfile )
tzhead read-struct check-magic dup { check-magic tzhead read-struct dup {
[ tzh_timecnt>> [ read-be32 ] replicate ] [ tzh_timecnt>> [ read-be32 ] replicate ]
[ tzh_timecnt>> [ read1 ] replicate ] [ tzh_timecnt>> [ read1 ] replicate ]
[ tzh_typecnt>> [ ttinfo read-struct ] replicate ] [ tzh_typecnt>> [ ttinfo read-struct ] replicate ]