@@ -17,18 +17,8 @@ func GetKernelVersion() (*VersionInfo, error) {

 		return nil, err

 	}

-	release := make([]byte, len(uts.Release))

-

-	i := 0

-	for _, c := range uts.Release {

-		release[i] = byte(c)

-		i++

-	}

-

 	// Remove the \x00 from the release for Atoi to parse correctly

-	release = release[:bytes.IndexByte(release, 0)]

-

-	return ParseRelease(string(release))

+	return ParseRelease(string(uts.Release[:bytes.IndexByte(uts.Release[:], 0)]))

 }

 // CheckKernelVersion checks if current kernel is newer than (or equal to)

@@ -3,6 +3,8 @@

 package platform

 import (

+	"bytes"

+

 	"golang.org/x/sys/unix"

 )

@@ -12,5 +14,5 @@ func runtimeArchitecture() (string, error) {

 	if err := unix.Uname(utsname); err != nil {

 		return "", err

 	}

-	return charsToString(utsname.Machine), nil

+	return string(utsname.Machine[:bytes.IndexByte(utsname.Machine[:], 0)]), nil

 }

deleted file mode 100644

@@ -1,18 +0,0 @@

-// +build linux,386 linux,amd64 linux,arm64 s390x

-// see golang's sources golang.org/x/sys/unix/ztypes_linux_*.go that use int8

-

-package platform

-

-// Convert the OS/ARCH-specific utsname.Machine to string

-// given as an array of signed int8

-func charsToString(ca [65]int8) string {

-	s := make([]byte, len(ca))

-	var lens int

-	for ; lens < len(ca); lens++ {

-		if ca[lens] == 0 {

-			break

-		}

-		s[lens] = uint8(ca[lens])

-	}

-	return string(s[0:lens])

-}

deleted file mode 100644

@@ -1,16 +0,0 @@

-// +build linux,386 linux,amd64 linux,arm64 s390x

-

-package platform

-

-import (

-	"testing"

-

-	"github.com/stretchr/testify/assert"

-)

-

-func TestCharToString(t *testing.T) {

-	machineInBytes := [65]int8{120, 56, 54, 95, 54, 52}

-	machineInString := charsToString(machineInBytes)

-	assert.NotNil(t, machineInString, "Unable to convert char into string.")

-	assert.Equal(t, string("x86_64"), machineInString, "Parsed machine code not equal.")

-}

deleted file mode 100644

@@ -1,18 +0,0 @@

-// +build linux,arm linux,ppc64 linux,ppc64le

-// see golang's sources golang.org/x/sys/unix/ztypes_linux_*.go that use uint8

-

-package platform

-

-// Convert the OS/ARCH-specific utsname.Machine to string

-// given as an array of unsigned uint8

-func charsToString(ca [65]uint8) string {

-	s := make([]byte, len(ca))

-	var lens int

-	for ; lens < len(ca); lens++ {

-		if ca[lens] == 0 {

-			break

-		}

-		s[lens] = ca[lens]

-	}

-	return string(s[0:lens])

-}

deleted file mode 100644

@@ -1,16 +0,0 @@

-// +build linux,arm linux,ppc64 linux,ppc64le

-

-package platform

-

-import (

-	"testing"

-

-	"github.com/stretchr/testify/assert"

-)

-

-func TestTestCharToString(t *testing.T) {

-	machineInBytes := [65]uint8{120, 56, 54, 95, 54, 52}

-	machineInString := charsToString(machineInBytes)

-	assert.NotNil(t, machineInString, "Unable to convert char into string.")

-	assert.Equal(t, string("x86_64"), machineInString, "Parsed machine code not equal.")

-}

@@ -14,7 +14,7 @@ github.com/sirupsen/logrus v1.0.3

 github.com/tchap/go-patricia v2.2.6

 github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3

 golang.org/x/net 7dcfb8076726a3fdd9353b6b8a1f1b6be6811bd6

-golang.org/x/sys 8dbc5d05d6edcc104950cc299a1ce6641235bc86

+golang.org/x/sys 95c6576299259db960f6c5b9b69ea52422860fce

 github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1

 github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d

 golang.org/x/text f72d8390a633d5dfb0cc84043294db9f6c935756

@@ -1,4 +1,4 @@

-// Copyright 2010 The Go Authors.  All rights reserved.

+// Copyright 2010 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.

@@ -1,4 +1,4 @@

-// Copyright 2014 The Go Authors.  All rights reserved.

+// Copyright 2014 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.

@@ -1,4 +1,4 @@

-// Copyright 2015 The Go Authors.  All rights reserved.

+// Copyright 2015 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.

@@ -8,7 +8,7 @@ package unix

 import "syscall"

-// We can't use the gc-syntax .s files for gccgo.  On the plus side

+// We can't use the gc-syntax .s files for gccgo. On the plus side

 // much of the functionality can be written directly in Go.

 //extern gccgoRealSyscall

@@ -1,4 +1,4 @@

-// Copyright 2015 The Go Authors.  All rights reserved.

+// Copyright 2015 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.

@@ -1,4 +1,4 @@

-// Copyright 2015 The Go Authors.  All rights reserved.

+// Copyright 2015 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.

@@ -1,4 +1,4 @@

-// Copyright 2017 The Go Authors.  All rights reserved.

+// Copyright 2017 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.

@@ -1,4 +1,4 @@

-// Copyright 2012 The Go Authors.  All rights reserved.

+// Copyright 2012 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.

@@ -1,4 +1,4 @@

-// Copyright 2012 The Go Authors.  All rights reserved.

+// Copyright 2012 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.

@@ -1,4 +1,4 @@

-// Copyright 2011 The Go Authors.  All rights reserved.

+// Copyright 2011 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.

@@ -5,10 +5,10 @@

 // +build darwin dragonfly freebsd linux netbsd openbsd solaris

 // Package unix contains an interface to the low-level operating system

-// primitives.  OS details vary depending on the underlying system, and

+// primitives. OS details vary depending on the underlying system, and

 // by default, godoc will display OS-specific documentation for the current

-// system.  If you want godoc to display OS documentation for another

-// system, set $GOOS and $GOARCH to the desired system.  For example, if

+// system. If you want godoc to display OS documentation for another

+// system, set $GOOS and $GOARCH to the desired system. For example, if

 // you want to view documentation for freebsd/arm on linux/amd64, set $GOOS

 // to freebsd and $GOARCH to arm.

 // The primary use of this package is inside other packages that provide a more

@@ -49,21 +49,3 @@ func BytePtrFromString(s string) (*byte, error) {

 // Single-word zero for use when we need a valid pointer to 0 bytes.

 // See mkunix.pl.

 var _zero uintptr

-

-func (ts *Timespec) Unix() (sec int64, nsec int64) {

-	return int64(ts.Sec), int64(ts.Nsec)

-}

-

-func (tv *Timeval) Unix() (sec int64, nsec int64) {

-	return int64(tv.Sec), int64(tv.Usec) * 1000

-}

-

-func (ts *Timespec) Nano() int64 {

-	return int64(ts.Sec)*1e9 + int64(ts.Nsec)

-}

-

-func (tv *Timeval) Nano() int64 {

-	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1000

-}

-

-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }

@@ -34,7 +34,7 @@ func Getgroups() (gids []int, err error) {

 		return nil, nil

 	}

-	// Sanity check group count.  Max is 16 on BSD.

+	// Sanity check group count. Max is 16 on BSD.

 	if n < 0 || n > 1000 {

 		return nil, EINVAL

 	}

@@ -607,6 +607,15 @@ func Futimes(fd int, tv []Timeval) error {

 //sys	fcntl(fd int, cmd int, arg int) (val int, err error)

+//sys   poll(fds *PollFd, nfds int, timeout int) (n int, err error)

+

+func Poll(fds []PollFd, timeout int) (n int, err error) {

+	if len(fds) == 0 {

+		return poll(nil, 0, timeout)

+	}

+	return poll(&fds[0], len(fds), timeout)

+}

+

 // TODO: wrap

 //	Acct(name nil-string) (err error)

 //	Gethostuuid(uuid *byte, timeout *Timespec) (err error)

@@ -54,7 +54,7 @@ func nametomib(name string) (mib []_C_int, err error) {

 	// NOTE(rsc): It seems strange to set the buffer to have

 	// size CTL_MAXNAME+2 but use only CTL_MAXNAME

-	// as the size.  I don't know why the +2 is here, but the

+	// as the size. I don't know why the +2 is here, but the

 	// kernel uses +2 for its own implementation of this function.

 	// I am scared that if we don't include the +2 here, the kernel

 	// will silently write 2 words farther than we specify

@@ -377,7 +377,6 @@ func IoctlGetTermios(fd int, req uint) (*Termios, error) {

 // Searchfs

 // Delete

 // Copyfile

-// Poll

 // Watchevent

 // Waitevent

 // Modwatch

@@ -11,25 +11,18 @@ 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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Usec = int32(nsec % 1e9 / 1e3)

-	tv.Sec = int32(nsec / 1e9)

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: int32(sec), Usec: int32(usec)}

 }

 //sysnb	gettimeofday(tp *Timeval) (sec int32, usec int32, err error)

 func Gettimeofday(tv *Timeval) (err error) {

 	// The tv passed to gettimeofday must be non-nil

-	// but is otherwise unused.  The answers come back

+	// but is otherwise unused. The answers come back

 	// in the two registers.

 	sec, usec, err := gettimeofday(tv)

 	tv.Sec = int32(sec)

@@ -11,25 +11,18 @@ 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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: sec, Nsec: nsec}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Usec = int32(nsec % 1e9 / 1e3)

-	tv.Sec = int64(nsec / 1e9)

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: sec, Usec: int32(usec)}

 }

 //sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)

 func Gettimeofday(tv *Timeval) (err error) {

 	// The tv passed to gettimeofday must be non-nil

-	// but is otherwise unused.  The answers come back

+	// but is otherwise unused. The answers come back

 	// in the two registers.

 	sec, usec, err := gettimeofday(tv)

 	tv.Sec = sec

@@ -9,25 +9,18 @@ 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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Usec = int32(nsec % 1e9 / 1e3)

-	tv.Sec = int32(nsec / 1e9)

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: int32(sec), Usec: int32(usec)}

 }

 //sysnb	gettimeofday(tp *Timeval) (sec int32, usec int32, err error)

 func Gettimeofday(tv *Timeval) (err error) {

 	// The tv passed to gettimeofday must be non-nil

-	// but is otherwise unused.  The answers come back

+	// but is otherwise unused. The answers come back

 	// in the two registers.

 	sec, usec, err := gettimeofday(tv)

 	tv.Sec = int32(sec)

@@ -11,25 +11,18 @@ 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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: sec, Nsec: nsec}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Usec = int32(nsec % 1e9 / 1e3)

-	tv.Sec = int64(nsec / 1e9)

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: sec, Usec: int32(usec)}

 }

 //sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)

 func Gettimeofday(tv *Timeval) (err error) {

 	// The tv passed to gettimeofday must be non-nil

-	// but is otherwise unused.  The answers come back

+	// but is otherwise unused. The answers come back

 	// in the two registers.

 	sec, usec, err := gettimeofday(tv)

 	tv.Sec = sec

@@ -257,7 +257,6 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {

 // Searchfs

 // Delete

 // Copyfile

-// Poll

 // Watchevent

 // Waitevent

 // Modwatch

@@ -403,7 +402,6 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {

 // Pread_nocancel

 // Pwrite_nocancel

 // Waitid_nocancel

-// Poll_nocancel

 // Msgsnd_nocancel

 // Msgrcv_nocancel

 // Sem_wait_nocancel

@@ -11,19 +11,12 @@ 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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: sec, Nsec: nsec}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Usec = nsec % 1e9 / 1e3

-	tv.Sec = int64(nsec / 1e9)

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: sec, Usec: usec}

 }

 func SetKevent(k *Kevent_t, fd, mode, flags int) {

@@ -32,7 +32,7 @@ func nametomib(name string) (mib []_C_int, err error) {

 	// NOTE(rsc): It seems strange to set the buffer to have

 	// size CTL_MAXNAME+2 but use only CTL_MAXNAME

-	// as the size.  I don't know why the +2 is here, but the

+	// as the size. I don't know why the +2 is here, but the

 	// kernel uses +2 for its own implementation of this function.

 	// I am scared that if we don't include the +2 here, the kernel

 	// will silently write 2 words farther than we specify

@@ -550,7 +550,6 @@ func IoctlGetTermios(fd int, req uint) (*Termios, error) {

 // Searchfs

 // Delete

 // Copyfile

-// Poll

 // Watchevent

 // Waitevent

 // Modwatch

@@ -11,19 +11,12 @@ 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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Usec = int32(nsec % 1e9 / 1e3)

-	tv.Sec = int32(nsec / 1e9)

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: int32(sec), Usec: int32(usec)}

 }

 func SetKevent(k *Kevent_t, fd, mode, flags int) {

@@ -11,19 +11,12 @@ 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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: sec, Nsec: nsec}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Usec = nsec % 1e9 / 1e3

-	tv.Sec = int64(nsec / 1e9)

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: sec, Usec: usec}

 }

 func SetKevent(k *Kevent_t, fd, mode, flags int) {

@@ -11,19 +11,12 @@ 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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: sec, Nsec: int32(nsec)}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Usec = int32(nsec % 1e9 / 1e3)

-	tv.Sec = nsec / 1e9

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: sec, Usec: int32(usec)}

 }

 func SetKevent(k *Kevent_t, fd, mode, flags int) {

@@ -255,7 +255,7 @@ func Getgroups() (gids []int, err error) {

 		return nil, nil

 	}

-	// Sanity check group count.  Max is 1<<16 on Linux.

+	// Sanity check group count. Max is 1<<16 on Linux.

 	if n < 0 || n > 1<<20 {

 		return nil, EINVAL

 	}

@@ -290,8 +290,8 @@ type WaitStatus uint32

 // 0x7F (stopped), or a signal number that caused an exit.

 // The 0x80 bit is whether there was a core dump.

 // An extra number (exit code, signal causing a stop)

-// is in the high bits.  At least that's the idea.

-// There are various irregularities.  For example, the

+// is in the high bits. At least that's the idea.

+// There are various irregularities. For example, the

 // "continued" status is 0xFFFF, distinguishing itself

 // from stopped via the core dump bit.

@@ -926,7 +926,7 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from

 	msg.Namelen = uint32(SizeofSockaddrAny)

 	var iov Iovec

 	if len(p) > 0 {

-		iov.Base = (*byte)(unsafe.Pointer(&p[0]))

+		iov.Base = &p[0]

 		iov.SetLen(len(p))

 	}

 	var dummy byte

@@ -941,7 +941,7 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from

 			iov.Base = &dummy

 			iov.SetLen(1)

 		}

-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))

+		msg.Control = &oob[0]

 		msg.SetControllen(len(oob))

 	}

 	msg.Iov = &iov

@@ -974,11 +974,11 @@ func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error)

 		}

 	}

 	var msg Msghdr

-	msg.Name = (*byte)(unsafe.Pointer(ptr))

+	msg.Name = (*byte)(ptr)

 	msg.Namelen = uint32(salen)

 	var iov Iovec

 	if len(p) > 0 {

-		iov.Base = (*byte)(unsafe.Pointer(&p[0]))

+		iov.Base = &p[0]

 		iov.SetLen(len(p))

 	}

 	var dummy byte

@@ -993,7 +993,7 @@ func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error)

 			iov.Base = &dummy

 			iov.SetLen(1)

 		}

-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))

+		msg.Control = &oob[0]

 		msg.SetControllen(len(oob))

 	}

 	msg.Iov = &iov

@@ -1023,7 +1023,7 @@ func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, err erro

 	var buf [sizeofPtr]byte

-	// Leading edge.  PEEKTEXT/PEEKDATA don't require aligned

+	// Leading edge. PEEKTEXT/PEEKDATA don't require aligned

 	// access (PEEKUSER warns that it might), but if we don't

 	// align our reads, we might straddle an unmapped page

 	// boundary and not get the bytes leading up to the page

@@ -14,19 +14,12 @@ 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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Sec = int32(nsec / 1e9)

-	tv.Usec = int32(nsec % 1e9 / 1e3)

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: int32(sec), Usec: int32(usec)}

 }

 //sysnb	pipe(p *[2]_C_int) (err error)

@@ -183,9 +176,9 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {

 // On x86 Linux, all the socket calls go through an extra indirection,

 // I think because the 5-register system call interface can't handle

-// the 6-argument calls like sendto and recvfrom.  Instead the

+// the 6-argument calls like sendto and recvfrom. Instead the

 // arguments to the underlying system call are the number below

-// and a pointer to an array of uintptr.  We hide the pointer in the

+// and a pointer to an array of uintptr. We hide the pointer in the

 // socketcall assembly to avoid allocation on every system call.

 const (

@@ -83,19 +83,12 @@ func Time(t *Time_t) (tt Time_t, err error) {

 //sys	Utime(path string, buf *Utimbuf) (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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: sec, Nsec: nsec}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Sec = nsec / 1e9

-	tv.Usec = nsec % 1e9 / 1e3

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: sec, Usec: usec}

 }

 //sysnb	pipe(p *[2]_C_int) (err error)

@@ -11,19 +11,12 @@ 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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Sec = int32(nsec / 1e9)

-	tv.Usec = int32(nsec % 1e9 / 1e3)

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: int32(sec), Usec: int32(usec)}

 }

 func Pipe(p []int) (err error) {

@@ -73,19 +73,12 @@ func Lstat(path string, stat *Stat_t) (err error) {

 //sysnb	Gettimeofday(tv *Timeval) (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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: sec, Nsec: nsec}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Sec = nsec / 1e9

-	tv.Usec = nsec % 1e9 / 1e3

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: sec, Usec: usec}

 }

 func Time(t *Time_t) (Time_t, error) {

@@ -76,19 +76,12 @@ func Time(t *Time_t) (tt Time_t, err error) {

 //sys	Utime(path string, buf *Utimbuf) (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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: sec, Nsec: nsec}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Sec = nsec / 1e9

-	tv.Usec = nsec % 1e9 / 1e3

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: sec, Usec: usec}

 }

 func Pipe(p []int) (err error) {

@@ -99,19 +99,12 @@ func Seek(fd int, offset int64, whence int) (off int64, err error) {

 	return

 }

-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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Sec = int32(nsec / 1e9)

-	tv.Usec = int32(nsec % 1e9 / 1e3)

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: int32(sec), Usec: int32(usec)}

 }

 //sysnb pipe2(p *[2]_C_int, flags int) (err error)

@@ -66,19 +66,12 @@ package unix

 //sys	Utime(path string, buf *Utimbuf) (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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: sec, Nsec: nsec}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Sec = nsec / 1e9

-	tv.Usec = nsec % 1e9 / 1e3

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: sec, Usec: usec}

 }

 func (r *PtraceRegs) PC() uint64 { return r.Nip }

@@ -62,19 +62,12 @@ func Time(t *Time_t) (tt Time_t, err error) {

 //sys	Utime(path string, buf *Utimbuf) (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 setTimespec(sec, nsec int64) Timespec {

+	return Timespec{Sec: sec, Nsec: nsec}

 }

-func NsecToTimeval(nsec int64) (tv Timeval) {

-	nsec += 999 // round up to microsecond

-	tv.Sec = nsec / 1e9

-	tv.Usec = nsec % 1e9 / 1e3

-	return

+func setTimeval(sec, usec int64) Timeval {

+	return Timeval{Sec: sec, Usec: usec}

 }

 //sysnb pipe2(p *[2]_C_int, flags int) (err error)

@@ -82,19 +82,12 @@ func Time(t *Time_t) (tt Time_t, err error) {

 //sys	Utime(path string, buf *Utimbuf) (err error)