diff options
author | Bo <bohende@gmail.com> | 2017-11-13 04:24:42 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2017-11-13 04:24:42 +0800 |
commit | cb8bbe70819839e6399c44fff6a75ab3d16b8791 (patch) | |
tree | 1beb6efbe63416f7921f4914d228cc7d78b49c09 /vendor/golang.org/x/sys/unix/syscall_linux_s390x.go | |
parent | f47adc9ea8f16544a023ea9b67d1ed320750c5e7 (diff) | |
download | go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.tar go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.tar.gz go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.tar.bz2 go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.tar.lz go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.tar.xz go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.tar.zst go-tangerine-cb8bbe70819839e6399c44fff6a75ab3d16b8791.zip |
puppeth: handle encrypted ssh keys (closes #15442) (#15443)
* cmd/puppeth: handle encrypted ssh keys
* cmd/puppeth: fix unconvert linter error
Diffstat (limited to 'vendor/golang.org/x/sys/unix/syscall_linux_s390x.go')
-rw-r--r-- | vendor/golang.org/x/sys/unix/syscall_linux_s390x.go | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go index 1708a4bbf..e96a40cb2 100644 --- a/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go +++ b/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go @@ -46,8 +46,6 @@ import ( //sysnb getgroups(n int, list *_Gid_t) (nn int, err error) //sysnb setgroups(n int, list *_Gid_t) (err error) -func Getpagesize() int { return 4096 } - //sysnb Gettimeofday(tv *Timeval) (err error) func Time(t *Time_t) (tt Time_t, err error) { @@ -64,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) |