syscall: unify TimespecToNsec and TimevalToNsec

All implementations of these functions are identical.

Change-Id: I7cbea53c02bb0cee75e30beed19d29ba0a7ef657
Reviewed-on: https://go-review.googlesource.com/30819
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/syscall/syscall_darwin_386.go b/src/syscall/syscall_darwin_386.go
index 11a991e78909de192b7115d13f6d9c2e59a16a9c..2fc93f5dd14d8757e5131066a99127dd0e0234c2 100644 (file)
--- a/src/syscall/syscall_darwin_386.go
+++ b/src/syscall/syscall_darwin_386.go
@@ -6,16 +6,12 @@ package syscall
 
 import "unsafe"
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = int32(nsec / 1e9)
        ts.Nsec = int32(nsec % 1e9)
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_darwin_amd64.go b/src/syscall/syscall_darwin_amd64.go
index d7951e8654f2182540575f50886984b253be91a0..e8c9384b180ec989d5fb36266acaef41b16efcc4 100644 (file)
--- a/src/syscall/syscall_darwin_amd64.go
+++ b/src/syscall/syscall_darwin_amd64.go
@@ -6,16 +6,12 @@ package syscall
 
 import "unsafe"
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = nsec / 1e9
        ts.Nsec = nsec % 1e9
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_darwin_arm.go b/src/syscall/syscall_darwin_arm.go
index 830a2e077be7230c660173569e81b0d0a11d5752..c42138263c604ccd833869d7c120a804b3695f8e 100644 (file)
--- a/src/syscall/syscall_darwin_arm.go
+++ b/src/syscall/syscall_darwin_arm.go
@@ -6,16 +6,12 @@ package syscall
 
 import "unsafe"
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = int32(nsec / 1e9)
        ts.Nsec = int32(nsec % 1e9)
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_darwin_arm64.go b/src/syscall/syscall_darwin_arm64.go
index 02316a78fcf4067ed441f3cc482e9b337fa21b50..43190c00f985dc3dedaec5172632ba9dc5f95631 100644 (file)
--- a/src/syscall/syscall_darwin_arm64.go
+++ b/src/syscall/syscall_darwin_arm64.go
@@ -6,16 +6,12 @@ package syscall
 
 import "unsafe"
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = nsec / 1e9
        ts.Nsec = nsec % 1e9
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_dragonfly_amd64.go b/src/syscall/syscall_dragonfly_amd64.go
index 7cad7257cd963e0ccf09a69f457c423e0d447f6b..b5406e22853118b0eb6d4479f8e357ecd807c31c 100644 (file)
--- a/src/syscall/syscall_dragonfly_amd64.go
+++ b/src/syscall/syscall_dragonfly_amd64.go
@@ -6,16 +6,12 @@ package syscall
 
 import "unsafe"
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = nsec / 1e9
        ts.Nsec = nsec % 1e9
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = nsec % 1e9 / 1e3

diff --git a/src/syscall/syscall_freebsd_386.go b/src/syscall/syscall_freebsd_386.go
index 7b53dc24944d4196867b12a769924f5977ed5054..f440f5f98722da4077e8fc8b28299b12c0f4a4d7 100644 (file)
--- a/src/syscall/syscall_freebsd_386.go
+++ b/src/syscall/syscall_freebsd_386.go
@@ -6,16 +6,12 @@ package syscall
 
 import "unsafe"
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = int32(nsec / 1e9)
        ts.Nsec = int32(nsec % 1e9)
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_freebsd_amd64.go b/src/syscall/syscall_freebsd_amd64.go
index 7cad7257cd963e0ccf09a69f457c423e0d447f6b..b5406e22853118b0eb6d4479f8e357ecd807c31c 100644 (file)
--- a/src/syscall/syscall_freebsd_amd64.go
+++ b/src/syscall/syscall_freebsd_amd64.go
@@ -6,16 +6,12 @@ package syscall
 
 import "unsafe"
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = nsec / 1e9
        ts.Nsec = nsec % 1e9
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = nsec % 1e9 / 1e3

diff --git a/src/syscall/syscall_freebsd_arm.go b/src/syscall/syscall_freebsd_arm.go
index 83fa1d7bfc3b0bbb41d67ac16343782c9179238d..e43cb6256f29047dc83fddd72abda17220bafcb3 100644 (file)
--- a/src/syscall/syscall_freebsd_arm.go
+++ b/src/syscall/syscall_freebsd_arm.go
@@ -6,16 +6,12 @@ package syscall
 
 import "unsafe"
 
-func TimespecToNsec(ts Timespec) int64 { return ts.Sec*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = nsec / 1e9
        ts.Nsec = int32(nsec % 1e9)
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return tv.Sec*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_linux_386.go b/src/syscall/syscall_linux_386.go
index 4f3c7c440a69c95b9dd1752b8b471eb3ece5c231..b7b84b1c34a33fe1a1980d06ffb77e3f234b6151 100644 (file)
--- a/src/syscall/syscall_linux_386.go
+++ b/src/syscall/syscall_linux_386.go
@@ -14,16 +14,12 @@ const (
        _SYS_getdents = SYS_GETDENTS64
 )
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = int32(nsec / 1e9)
        ts.Nsec = int32(nsec % 1e9)
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Sec = int32(nsec / 1e9)

diff --git a/src/syscall/syscall_linux_amd64.go b/src/syscall/syscall_linux_amd64.go
index 119204b70b549d570dde22a3a1d859324b2337f5..faa973dbdfb06167c56d3702970b6c72a4f8cd55 100644 (file)
--- a/src/syscall/syscall_linux_amd64.go
+++ b/src/syscall/syscall_linux_amd64.go
@@ -84,16 +84,12 @@ func Time(t *Time_t) (tt Time_t, err error) {
        return Time_t(tv.Sec), nil
 }
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = nsec / 1e9
        ts.Nsec = nsec % 1e9
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Sec = nsec / 1e9

diff --git a/src/syscall/syscall_linux_arm.go b/src/syscall/syscall_linux_arm.go
index b38b7e5483e7534aad393d76815e5b8dc04283f4..c4e0a1ce0eb844aebf97603c901d699632ea8408 100644 (file)
--- a/src/syscall/syscall_linux_arm.go
+++ b/src/syscall/syscall_linux_arm.go
@@ -11,8 +11,6 @@ const (
        _SYS_getdents = SYS_GETDENTS64
 )
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = int32(nsec / 1e9)
        ts.Nsec = int32(nsec % 1e9)

diff --git a/src/syscall/syscall_linux_arm64.go b/src/syscall/syscall_linux_arm64.go
index 98681d359b5545d97d84f2f9d05a1b3a04f17937..01c72f16b8b5fd1e2ff4f33ff31acaaf65e14e4d 100644 (file)
--- a/src/syscall/syscall_linux_arm64.go
+++ b/src/syscall/syscall_linux_arm64.go
@@ -71,16 +71,12 @@ func Lstat(path string, stat *Stat_t) (err error) {
 //sysnb        Gettimeofday(tv *Timeval) (err error)
 //sysnb        Time(t *Time_t) (tt Time_t, err error)
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = nsec / 1e9
        ts.Nsec = nsec % 1e9
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Sec = nsec / 1e9

diff --git a/src/syscall/syscall_linux_mips64x.go b/src/syscall/syscall_linux_mips64x.go
index a1331a89f3e7edc914863af375e5dc140355b8e6..251609b62d2a6492fb737399e5b8f799081f8068 100644 (file)
--- a/src/syscall/syscall_linux_mips64x.go
+++ b/src/syscall/syscall_linux_mips64x.go
@@ -79,16 +79,12 @@ func Time(t *Time_t) (tt Time_t, err error) {
        return Time_t(tv.Sec), nil
 }
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = nsec / 1e9
        ts.Nsec = nsec % 1e9
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Sec = nsec / 1e9

diff --git a/src/syscall/syscall_linux_ppc64x.go b/src/syscall/syscall_linux_ppc64x.go
index e931ee4630352546ff3d9baf5888a4f8a5624961..876805eca8daa17ab7d8d4c44b56d154a1152dba 100644 (file)
--- a/src/syscall/syscall_linux_ppc64x.go
+++ b/src/syscall/syscall_linux_ppc64x.go
@@ -67,16 +67,12 @@ const (
 //sysnb        Gettimeofday(tv *Timeval) (err error)
 //sysnb        Time(t *Time_t) (tt Time_t, err error)
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = nsec / 1e9
        ts.Nsec = nsec % 1e9
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Sec = nsec / 1e9

diff --git a/src/syscall/syscall_linux_s390x.go b/src/syscall/syscall_linux_s390x.go
index b67d7aab38077f7c6d9f9af106d1db5791c504fd..50e987ab5b1bc6a679eb50d2450102f3b7ed90ad 100644 (file)
--- a/src/syscall/syscall_linux_s390x.go
+++ b/src/syscall/syscall_linux_s390x.go
@@ -58,16 +58,12 @@ func Time(t *Time_t) (tt Time_t, err error) {
        return Time_t(tv.Sec), nil
 }
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = nsec / 1e9
        ts.Nsec = nsec % 1e9
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Sec = nsec / 1e9

diff --git a/src/syscall/syscall_nacl_386.go b/src/syscall/syscall_nacl_386.go
index 0d685a6ed9f5f8dd59034a798f48ba2d629c7173..76f23989ec7c99920b6fd1eaf6e660be8b1854e7 100644 (file)
--- a/src/syscall/syscall_nacl_386.go
+++ b/src/syscall/syscall_nacl_386.go
@@ -14,16 +14,12 @@ type Timeval struct {
        Usec int32
 }
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = int64(nsec / 1e9)
        ts.Nsec = int32(nsec % 1e9)
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_nacl_amd64p32.go b/src/syscall/syscall_nacl_amd64p32.go
index 0d685a6ed9f5f8dd59034a798f48ba2d629c7173..76f23989ec7c99920b6fd1eaf6e660be8b1854e7 100644 (file)
--- a/src/syscall/syscall_nacl_amd64p32.go
+++ b/src/syscall/syscall_nacl_amd64p32.go
@@ -14,16 +14,12 @@ type Timeval struct {
        Usec int32
 }
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = int64(nsec / 1e9)
        ts.Nsec = int32(nsec % 1e9)
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_nacl_arm.go b/src/syscall/syscall_nacl_arm.go
index 5d72503e5df40059f1ef1c6679ab71e5b56dc44c..8796d68df0422c20e511636694eab39e08f05108 100644 (file)
--- a/src/syscall/syscall_nacl_arm.go
+++ b/src/syscall/syscall_nacl_arm.go
@@ -14,16 +14,12 @@ type Timeval struct {
        Usec int32
 }
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = int64(nsec / 1e9)
        ts.Nsec = int32(nsec % 1e9)
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_netbsd_386.go b/src/syscall/syscall_netbsd_386.go
index 71c639c88b7005412bf4297fad4caf412837bc5d..0218b12edf884e61c30b3c1e542e3178cf40c772 100644 (file)
--- a/src/syscall/syscall_netbsd_386.go
+++ b/src/syscall/syscall_netbsd_386.go
@@ -4,16 +4,12 @@
 
 package syscall
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = int64(nsec / 1e9)
        ts.Nsec = int32(nsec % 1e9)
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_netbsd_amd64.go b/src/syscall/syscall_netbsd_amd64.go
index 4762da3a8242bca6a700366c05ec491faeb73ebe..0fd6fae46177dab00c479d285ed06ceef6a602d7 100644 (file)
--- a/src/syscall/syscall_netbsd_amd64.go
+++ b/src/syscall/syscall_netbsd_amd64.go
@@ -4,16 +4,12 @@
 
 package syscall
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = int64(nsec / 1e9)
        ts.Nsec = int64(nsec % 1e9)
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_netbsd_arm.go b/src/syscall/syscall_netbsd_arm.go
index 0160252608a0dea6fd007961e4d13951e1cdd44c..b5a754de35f1ad6aa781a4c389d7a4bf64450629 100644 (file)
--- a/src/syscall/syscall_netbsd_arm.go
+++ b/src/syscall/syscall_netbsd_arm.go
@@ -4,16 +4,12 @@
 
 package syscall
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = int64(nsec / 1e9)
        ts.Nsec = int32(nsec % 1e9)
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_openbsd_386.go b/src/syscall/syscall_openbsd_386.go
index c836a6fdf9baafa13d6706624714b5558eaba262..185f4b5ce64ccdbec393abf785e19e9e1fd88f3b 100644 (file)
--- a/src/syscall/syscall_openbsd_386.go
+++ b/src/syscall/syscall_openbsd_386.go
@@ -4,16 +4,12 @@
 
 package syscall
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = int64(nsec / 1e9)
        ts.Nsec = int32(nsec % 1e9)
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_openbsd_amd64.go b/src/syscall/syscall_openbsd_amd64.go
index ca8e7c0bcbb5731b12fef4c95d02048121588fff..a8aad0b07ef41a9291891a8fc47d7e54d636eda5 100644 (file)
--- a/src/syscall/syscall_openbsd_amd64.go
+++ b/src/syscall/syscall_openbsd_amd64.go
@@ -4,16 +4,12 @@
 
 package syscall
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = nsec / 1e9
        ts.Nsec = nsec % 1e9
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = nsec % 1e9 / 1e3

diff --git a/src/syscall/syscall_openbsd_arm.go b/src/syscall/syscall_openbsd_arm.go
index c836a6fdf9baafa13d6706624714b5558eaba262..185f4b5ce64ccdbec393abf785e19e9e1fd88f3b 100644 (file)
--- a/src/syscall/syscall_openbsd_arm.go
+++ b/src/syscall/syscall_openbsd_arm.go
@@ -4,16 +4,12 @@
 
 package syscall
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = int64(nsec / 1e9)
        ts.Nsec = int32(nsec % 1e9)
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = int32(nsec % 1e9 / 1e3)

diff --git a/src/syscall/syscall_solaris_amd64.go b/src/syscall/syscall_solaris_amd64.go
index 5f918d3426d4564dc138a5603aaf4922ddf72107..5aa525f504d250baff75329cc8af9324015c0425 100644 (file)
--- a/src/syscall/syscall_solaris_amd64.go
+++ b/src/syscall/syscall_solaris_amd64.go
@@ -4,16 +4,12 @@
 
 package syscall
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
 func NsecToTimespec(nsec int64) (ts Timespec) {
        ts.Sec = nsec / 1e9
        ts.Nsec = nsec % 1e9
        return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
        nsec += 999 // round up to microsecond
        tv.Usec = nsec % 1e9 / 1e3

diff --git a/src/syscall/timestruct.go b/src/syscall/timestruct.go
new file mode 100644 (file)
index 0000000..4c4e204
--- /dev/null
+++ b/src/syscall/timestruct.go
@@ -0,0 +1,11 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+
+package syscall
+
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }