diff options
| -rw-r--r-- | src/time/zoneinfo_read.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/time/zoneinfo_read.go b/src/time/zoneinfo_read.go index eaaaf1f2b4..6fdcc1a2a8 100644 --- a/src/time/zoneinfo_read.go +++ b/src/time/zoneinfo_read.go @@ -33,12 +33,12 @@ const ( ) // Simple I/O interface to binary blob of data. -type data struct { +type dataIO struct { p []byte error bool } -func (d *data) read(n int) []byte { +func (d *dataIO) read(n int) []byte { if len(d.p) < n { d.p = nil d.error = true @@ -49,7 +49,7 @@ func (d *data) read(n int) []byte { return p } -func (d *data) big4() (n uint32, ok bool) { +func (d *dataIO) big4() (n uint32, ok bool) { p := d.read(4) if len(p) < 4 { d.error = true @@ -58,7 +58,7 @@ func (d *data) big4() (n uint32, ok bool) { return uint32(p[0])<<24 | uint32(p[1])<<16 | uint32(p[2])<<8 | uint32(p[3]), true } -func (d *data) byte() (n byte, ok bool) { +func (d *dataIO) byte() (n byte, ok bool) { p := d.read(1) if len(p) < 1 { d.error = true @@ -83,7 +83,7 @@ var badData = errors.New("malformed time zone information") // The expected format for Tzinfo is that of a timezone file as they are found in the // the IANA Time Zone database. func newLocationFromTzinfo(name string, Tzinfo []byte) (*Location, error) { - d := data{Tzinfo, false} + d := dataIO{Tzinfo, false} // 4-byte magic "TZif" if magic := d.read(4); string(magic) != "TZif" { @@ -121,13 +121,13 @@ func newLocationFromTzinfo(name string, Tzinfo []byte) (*Location, error) { } // Transition times. - txtimes := data{d.read(n[NTime] * 4), false} + txtimes := dataIO{d.read(n[NTime] * 4), false} // Time zone indices for transition times. txzones := d.read(n[NTime]) // Zone info structures - zonedata := data{d.read(n[NZone] * 6), false} + zonedata := dataIO{d.read(n[NZone] * 6), false} // Time zone abbreviations. abbrev := d.read(n[NChar]) |