diff options
| author | Russ Cox <rsc@golang.org> | 2009-01-20 14:40:40 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-01-20 14:40:40 -0800 |
| commit | 839a68469b6f8bf40620a7977041e089bbd0eba3 (patch) | |
| tree | f8305b165ee5ff41e9ef2b0f76e26f7ab3ece269 /src/lib/time | |
| parent | 0183baaf449338f54727814d079c0254c18226f9 (diff) | |
| download | go-839a68469b6f8bf40620a7977041e089bbd0eba3.tar.xz | |
delete export
TBR=r
OCL=23121
CL=23127
Diffstat (limited to 'src/lib/time')
| -rw-r--r-- | src/lib/time/tick.go | 4 | ||||
| -rw-r--r-- | src/lib/time/tick_test.go | 2 | ||||
| -rw-r--r-- | src/lib/time/time.go | 16 | ||||
| -rw-r--r-- | src/lib/time/time_test.go | 4 | ||||
| -rw-r--r-- | src/lib/time/zoneinfo.go | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/time/tick.go b/src/lib/time/tick.go index f200f30dd1..814e2bac1f 100644 --- a/src/lib/time/tick.go +++ b/src/lib/time/tick.go @@ -43,13 +43,13 @@ func ticker(ns int64, c chan int64) { } syscall.Nstotimeval(when - now, &tv); - syscall.Syscall6(syscall.SYS_SELECT, 0, 0, 0, 0, int64(uintptr(unsafe.pointer(&tv))), 0); + syscall.Syscall6(syscall.SYS_SELECT, 0, 0, 0, 0, int64(uintptr(unsafe.Pointer(&tv))), 0); now = time.Nanoseconds(); c <- now; } } -export func Tick(ns int64) chan int64 { +func Tick(ns int64) chan int64 { if ns <= 0 { return nil } diff --git a/src/lib/time/tick_test.go b/src/lib/time/tick_test.go index 79038dcf84..0667be679b 100644 --- a/src/lib/time/tick_test.go +++ b/src/lib/time/tick_test.go @@ -9,7 +9,7 @@ import ( "time"; ) -export func TestTick(t *testing.T) { +func TestTick(t *testing.T) { const ( Delta = 100*1e6; Count = 10; diff --git a/src/lib/time/time.go b/src/lib/time/time.go index 9421eeae5b..2af56f453b 100644 --- a/src/lib/time/time.go +++ b/src/lib/time/time.go @@ -10,7 +10,7 @@ import ( ) // Seconds since January 1, 1970 00:00:00 GMT -export func Seconds() int64 { +func Seconds() int64 { sec, nsec, err := os.Time(); if err != nil { panic("time: os.Time: ", err.String()); @@ -19,7 +19,7 @@ export func Seconds() int64 { } // Nanoseconds since January 1, 1970 00:00:00 GMT -export func Nanoseconds() int64 { +func Nanoseconds() int64 { sec, nsec, err := os.Time(); if err != nil { panic("time: os.Time: ", err.String()); @@ -27,7 +27,7 @@ export func Nanoseconds() int64 { return sec*1e9 + nsec } -export const ( +const ( Sunday = iota; Monday; Tuesday; @@ -37,7 +37,7 @@ export const ( Saturday; ) -export type Time struct { +type Time struct { year int64; // 2008 is 2008 month, day int; // Sep-17 is 9, 17 hour, minute, second int; // 10:43:12 is 10, 43, 12 @@ -70,7 +70,7 @@ const ( _Days1970To2001 = 31*365+8; ) -export func SecondsToUTC(sec int64) *Time { +func SecondsToUTC(sec int64) *Time { t := new(Time); // Split into time and day. @@ -143,12 +143,12 @@ export func SecondsToUTC(sec int64) *Time { return t; } -export func UTC() *Time { +func UTC() *Time { return SecondsToUTC(Seconds()) } // TODO: Should this return an error? -export func SecondsToLocalTime(sec int64) *Time { +func SecondsToLocalTime(sec int64) *Time { zone, offset, err := time.LookupTimezone(sec); if err != nil { return SecondsToUTC(sec) @@ -159,7 +159,7 @@ export func SecondsToLocalTime(sec int64) *Time { return t } -export func LocalTime() *Time { +func LocalTime() *Time { return SecondsToLocalTime(Seconds()) } diff --git a/src/lib/time/time_test.go b/src/lib/time/time_test.go index 61f0608add..feff13a480 100644 --- a/src/lib/time/time_test.go +++ b/src/lib/time/time_test.go @@ -41,7 +41,7 @@ func _Same(t, u *Time) bool { && t.zone == u.zone } -export func TestSecondsToUTC(t *testing.T) { +func TestSecondsToUTC(t *testing.T) { for i := 0; i < len(utctests); i++ { sec := utctests[i].seconds; golden := &utctests[i].golden; @@ -58,7 +58,7 @@ export func TestSecondsToUTC(t *testing.T) { } } -export func TestSecondsToLocalTime(t *testing.T) { +func TestSecondsToLocalTime(t *testing.T) { for i := 0; i < len(localtests); i++ { sec := localtests[i].seconds; golden := &localtests[i].golden; diff --git a/src/lib/time/zoneinfo.go b/src/lib/time/zoneinfo.go index 6f2a1f3154..e43547c5e9 100644 --- a/src/lib/time/zoneinfo.go +++ b/src/lib/time/zoneinfo.go @@ -20,7 +20,7 @@ const ( _HeaderSize = 4+16+4*7 ) -export var ( +var ( BadZoneinfo = os.NewError("time: malformed zoneinfo"); NoZoneinfo = os.NewError("time: unknown time zone") ) @@ -250,7 +250,7 @@ func _SetupZone() { zones, zoneerr = readinfofile("/etc/localtime"); } -export func LookupTimezone(sec int64) (zone string, offset int, err *os.Error) { +func LookupTimezone(sec int64) (zone string, offset int, err *os.Error) { once.Do(&_SetupZone); if zoneerr != nil || len(zones) == 0 { return "GMT", 0, zoneerr |
