summaryrefslogtreecommitdiff
path: root/src/lib/time
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/time')
-rw-r--r--src/lib/time/time.go50
-rw-r--r--src/lib/time/zoneinfo.go54
2 files changed, 52 insertions, 52 deletions
diff --git a/src/lib/time/time.go b/src/lib/time/time.go
index 5705ff10f..b539c385a 100644
--- a/src/lib/time/time.go
+++ b/src/lib/time/time.go
@@ -12,14 +12,14 @@ import (
// Seconds since January 1, 1970 00:00:00 GMT
export func Seconds() (sec int64, err *os.Error) {
var nsec int64;
- sec, nsec, err = os.Time()
+ sec, nsec, err = os.Time();
return sec, err
}
// Nanoseconds since January 1, 1970 00:00:00 GMT
export func Nanoseconds() (nsec int64, err *os.Error) {
var sec int64;
- sec, nsec, err = os.Time()
+ sec, nsec, err = os.Time();
return sec*1e9 + nsec, err
}
@@ -75,7 +75,7 @@ export func SecondsToUTC(sec int64) *Time {
day := sec/SecondsPerDay;
sec -= day*SecondsPerDay;
if sec < 0 {
- day--
+ day--;
sec += SecondsPerDay
}
@@ -85,7 +85,7 @@ export func SecondsToUTC(sec int64) *Time {
t.second = int(sec%60);
// Day 0 = January 1, 1970 was a Thursday
- t.weekday = int((day + Thursday) % 7)
+ t.weekday = int((day + Thursday) % 7);
if t.weekday < 0 {
t.weekday += 7
}
@@ -95,7 +95,7 @@ export func SecondsToUTC(sec int64) *Time {
// (2001 begins 4-, 100-, and 400-year cycles ending in a leap year.)
day -= Days1970To2001;
- year := int64(2001)
+ year := int64(2001);
if day < 0 {
// Go back enough 400 year cycles to make day positive.
n := -day/DaysPer400Years + 1;
@@ -143,7 +143,7 @@ export func SecondsToUTC(sec int64) *Time {
export func UTC() (t *Time, err *os.Error) {
var sec int64;
- sec, err = Seconds()
+ sec, err = Seconds();
if err != nil {
return nil, err
}
@@ -152,7 +152,7 @@ export func UTC() (t *Time, err *os.Error) {
// TODO: Should this return an error?
export func SecondsToLocalTime(sec int64) *Time {
- zone, offset, err := time.LookupTimezone(sec)
+ zone, offset, err := time.LookupTimezone(sec);
if err != nil {
return SecondsToUTC(sec)
}
@@ -164,7 +164,7 @@ export func SecondsToLocalTime(sec int64) *Time {
export func LocalTime() (t *Time, err *os.Error) {
var sec int64;
- sec, err = Seconds()
+ sec, err = Seconds();
if err != nil {
return nil, err
}
@@ -175,7 +175,7 @@ export func LocalTime() (t *Time, err *os.Error) {
func (t *Time) Seconds() int64 {
// First, accumulate days since January 1, 2001.
// Using 2001 instead of 1970 makes the leap-year
- // handling easier (see SecondsToUTC), because
+ // handling easier (see SecondsToUTC), because
// it is at the beginning of the 4-, 100-, and 400-year cycles.
day := int64(0);
@@ -225,7 +225,7 @@ func (t *Time) Seconds() int64 {
sec += Days1970To2001 * SecondsPerDay;
// Account for local time zone.
- sec -= int64(t.zoneoffset)
+ sec -= int64(t.zoneoffset);
return sec
}
@@ -282,7 +282,7 @@ func Decimal(dst *[]byte, n int) {
func AddString(buf *[]byte, bp int, s string) int {
n := len(s);
- Copy(buf[bp:bp+n], s)
+ Copy(buf[bp:bp+n], s);
return bp+n
}
@@ -290,21 +290,21 @@ func AddString(buf *[]byte, bp int, s string) int {
// Not exported.
func Format(t *Time, fmt string) string {
buf := new([]byte, 128);
- bp := 0
+ bp := 0;
for i := 0; i < len(fmt); i++ {
if fmt[i] == '%' {
- i++
+ i++;
switch fmt[i] {
case 'A': // %A full weekday name
- bp = AddString(buf, bp, LongDayNames[t.weekday])
+ bp = AddString(buf, bp, LongDayNames[t.weekday]);
case 'a': // %a abbreviated weekday name
- bp = AddString(buf, bp, ShortDayNames[t.weekday])
+ bp = AddString(buf, bp, ShortDayNames[t.weekday]);
case 'b': // %b abbreviated month name
- bp = AddString(buf, bp, ShortMonthNames[t.month-1])
+ bp = AddString(buf, bp, ShortMonthNames[t.month-1]);
case 'd': // %d day of month (01-31)
Decimal(buf[bp:bp+2], t.day);
- bp += 2
+ bp += 2;
case 'e': // %e day of month ( 1-31)
if t.day >= 10 {
Decimal(buf[bp:bp+2], t.day)
@@ -312,24 +312,24 @@ func Format(t *Time, fmt string) string {
buf[bp] = ' ';
buf[bp+1] = byte(t.day + '0')
}
- bp += 2
+ bp += 2;
case 'H': // %H hour 00-23
Decimal(buf[bp:bp+2], t.hour);
- bp += 2
+ bp += 2;
case 'M': // %M minute 00-59
Decimal(buf[bp:bp+2], t.minute);
- bp += 2
+ bp += 2;
case 'S': // %S second 00-59
Decimal(buf[bp:bp+2], t.second);
- bp += 2
+ bp += 2;
case 'Y': // %Y year 2008
Decimal(buf[bp:bp+4], int(t.year));
- bp += 4
+ bp += 4;
case 'y': // %y year 08
Decimal(buf[bp:bp+2], int(t.year%100));
- bp += 2
+ bp += 2;
case 'Z':
- bp = AddString(buf, bp, t.zone)
+ bp = AddString(buf, bp, t.zone);
default:
buf[bp] = '%';
buf[bp+1] = fmt[i];
@@ -337,7 +337,7 @@ func Format(t *Time, fmt string) string {
}
} else {
buf[bp] = fmt[i];
- bp++
+ bp++;
}
}
return string(buf[0:bp])
diff --git a/src/lib/time/zoneinfo.go b/src/lib/time/zoneinfo.go
index 83ae8b9c7..b355d880c 100644
--- a/src/lib/time/zoneinfo.go
+++ b/src/lib/time/zoneinfo.go
@@ -31,16 +31,16 @@ type Data struct {
func (d *Data) Read(n int) *[]byte {
if d.p == nil || len(d.p) < n {
- d.p = nil
+ d.p = nil;
return nil
}
p := d.p[0:n];
- d.p = d.p[n:len(d.p)]
+ d.p = d.p[n:len(d.p)];
return p
}
func (d *Data) Big4() (n uint32, ok bool) {
- p := d.Read(4)
+ p := d.Read(4);
if p == nil {
return 0, false
}
@@ -48,7 +48,7 @@ func (d *Data) Big4() (n uint32, ok bool) {
}
func (d *Data) Byte() (n byte, ok bool) {
- p := d.Read(1)
+ p := d.Read(1);
if p == nil {
return 0, false
}
@@ -89,11 +89,11 @@ func ParseZoneinfo(bytes *[]byte) (zt *[]Zonetime, err *os.Error) {
}
// 1-byte version, then 15 bytes of padding
- var p *[]byte
+ var p *[]byte;
if p = data.Read(16); p == nil || p[0] != 0 && p[0] != '2' {
return nil, BadZoneinfo
}
- vers := p[0]
+ vers := p[0];
// six big-endian 32-bit integers:
// number of UTC/local indicators
@@ -110,9 +110,9 @@ func ParseZoneinfo(bytes *[]byte) (zt *[]Zonetime, err *os.Error) {
NZone;
NChar
)
- var n [6]int
+ var n [6]int;
for i := 0; i < 6; i++ {
- nn, ok := data.Big4()
+ nn, ok := data.Big4();
if !ok {
return nil, BadZoneinfo
}
@@ -156,19 +156,19 @@ func ParseZoneinfo(bytes *[]byte) (zt *[]Zonetime, err *os.Error) {
// Now we can build up a useful data structure.
// First the zone information.
// utcoff[4] isdst[1] nameindex[1]
- zone := new([]Zone, n[NZone])
+ zone := new([]Zone, n[NZone]);
for i := 0; i < len(zone); i++ {
var ok bool;
- var n uint32
+ var n uint32;
if n, ok = zonedata.Big4(); !ok {
return nil, BadZoneinfo
}
- zone[i].utcoff = int(n)
- var b byte
+ zone[i].utcoff = int(n);
+ var b byte;
if b, ok = zonedata.Byte(); !ok {
return nil, BadZoneinfo
}
- zone[i].isdst = b != 0
+ zone[i].isdst = b != 0;
if b, ok = zonedata.Byte(); !ok || int(b) >= len(abbrev) {
return nil, BadZoneinfo
}
@@ -176,14 +176,14 @@ func ParseZoneinfo(bytes *[]byte) (zt *[]Zonetime, err *os.Error) {
}
// Now the transition time info.
- zt = new([]Zonetime, n[NTime])
+ zt = new([]Zonetime, n[NTime]);
for i := 0; i < len(zt); i++ {
var ok bool;
- var n uint32
+ var n uint32;
if n, ok = txtimes.Big4(); !ok {
return nil, BadZoneinfo
}
- zt[i].time = int32(n)
+ zt[i].time = int32(n);
if int(txzones[i]) >= len(zone) {
return nil, BadZoneinfo
}
@@ -199,35 +199,35 @@ func ParseZoneinfo(bytes *[]byte) (zt *[]Zonetime, err *os.Error) {
}
func ReadFile(name string, max int) (p *[]byte, err *os.Error) {
- fd, e := os.Open(name, os.O_RDONLY, 0)
+ fd, e := os.Open(name, os.O_RDONLY, 0);
if e != nil {
return nil, e
}
p = new([]byte, max+1)[0:0];
- n := 0
+ n := 0;
for len(p) < max {
- nn, e := fd.Read(p[n:cap(p)])
+ nn, e := fd.Read(p[n:cap(p)]);
if e != nil {
- fd.Close()
+ fd.Close();
return nil, e
}
if nn == 0 {
- fd.Close()
+ fd.Close();
return p, nil
}
p = p[0:n+nn]
}
- fd.Close()
+ fd.Close();
return nil, BadZoneinfo // too long
}
func ReadZoneinfoFile(name string) (tx *[]Zonetime, err *os.Error) {
- data, e := ReadFile(name, MaxFileSize)
+ data, e := ReadFile(name, MaxFileSize);
if e != nil {
return nil, e
}
- tx, err = ParseZoneinfo(data)
+ tx, err = ParseZoneinfo(data);
return tx, err
}
@@ -238,13 +238,13 @@ func SetupZone() {
// TODO: /etc/localtime is the default time zone info
// for the system, but libc allows setting an environment
// variable in order to direct reading a different file
- // (in /usr/share/zoneinfo). We should check that
+ // (in /usr/share/zoneinfo). We should check that
// environment variable.
zones, zoneerr = ReadZoneinfoFile("/etc/localtime");
}
export func LookupTimezone(sec int64) (zone string, offset int, err *os.Error) {
- once.Do(&SetupZone)
+ once.Do(&SetupZone);
if zoneerr != nil || zones == nil || len(zones) == 0 {
return "GMT", 0, zoneerr
}
@@ -259,6 +259,6 @@ export func LookupTimezone(sec int64) (zone string, offset int, err *os.Error) {
tz = tz[m:len(tz)]
}
}
- z := tz[0].zone
+ z := tz[0].zone;
return z.name, z.utcoff, nil
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-01 12:57:06 +0000