switch from syscall to golang.org/x/sys
(mostly) syscall has been frozen and mostly deprecated. We can't *entirely* switch but this brings us closer. License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Nov 6, 2017 at 13:12 UTC
63342578d3bc98544b96a7ad09d38a37014e33ae
4 files changed
+18
-10
cmd/ipfs/ulimit_freebsd.go
+5
-4
@@ -4,7 +4,8 @@ package main
4
5
import (
6
"fmt"
7
- "syscall"
7
+
8
+ unix "gx/ipfs/QmPXvegq26x982cQjSfbTvSzZXn7GiaMwhhVPHkeTEhrPT/sys/unix"
9
)
10
11
func init() {
@@ -12,8 +13,8 @@ func init() {
13
}
14
15
func checkAndSetUlimit() error {
15
- var rLimit syscall.Rlimit
16
- err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
16
+ var rLimit unix.Rlimit
17
+ err := unix.Getrlimit(unix.RLIMIT_NOFILE, &rLimit)
18
if err != nil {
19
return fmt.Errorf("error getting rlimit: %s", err)
20
}
@@ -31,7 +32,7 @@ func checkAndSetUlimit() error {
32
setting = true
33
}
34
34
- err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
35
+ err = unix.Setrlimit(unix.RLIMIT_NOFILE, &rLimit)
36
if err != nil {
37
return fmt.Errorf("error setting ulimit: %s", err)
38
}
cmd/ipfs/ulimit_unix.go
+5
-4
@@ -4,7 +4,8 @@ package main
4
5
import (
6
"fmt"
7
- "syscall"
7
+
8
+ unix "gx/ipfs/QmPXvegq26x982cQjSfbTvSzZXn7GiaMwhhVPHkeTEhrPT/sys/unix"
9
)
10
11
func init() {
@@ -12,8 +13,8 @@ func init() {
13
}
14
15
func checkAndSetUlimit() error {
15
- var rLimit syscall.Rlimit
16
- err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
16
+ var rLimit unix.Rlimit
17
+ err := unix.Getrlimit(unix.RLIMIT_NOFILE, &rLimit)
18
if err != nil {
19
return fmt.Errorf("error getting rlimit: %s", err)
20
}
@@ -29,7 +30,7 @@ func checkAndSetUlimit() error {
30
setting = true
31
}
32
32
- err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
33
+ err = unix.Setrlimit(unix.RLIMIT_NOFILE, &rLimit)
34
if err != nil {
35
return fmt.Errorf("error setting ulimit: %s", err)
36
}
fuse/node/mount_darwin.go
+2
-2
@@ -8,10 +8,10 @@ import (
8
"os/exec"
9
"runtime"
10
"strings"
11
- "syscall"
11
12
core "github.com/ipfs/go-ipfs/core"
13
14
+ unix "gx/ipfs/QmPXvegq26x982cQjSfbTvSzZXn7GiaMwhhVPHkeTEhrPT/sys/unix"
15
"gx/ipfs/QmYRGECuvQnRX73fcvPnGbYijBcGN2HbKZQ7jh26qmLiHG/semver"
16
)
17
@@ -165,7 +165,7 @@ func tryGFV() (string, error) {
165
}
166
167
func trySysctl() (string, error) {
168
- v, err := syscall.Sysctl("osxfuse.version.number")
168
+ v, err := unix.Sysctl("osxfuse.version.number")
169
if err != nil {
170
log.Debug("mount: sysctl osxfuse.version.number:", "failed")
171
return "", err
package.json
+6
@@ -497,6 +497,12 @@
497
"hash": "QmeS8cCKawUwejVrsBtmC1toTXmwVWZGiRJqzgTURVWeF9",
498
"name": "go-ipfs-addr",
499
"version": "0.1.1"
500
+ },
501
+ {
502
+ "author": "The Go Authors",
503
+ "hash": "QmPXvegq26x982cQjSfbTvSzZXn7GiaMwhhVPHkeTEhrPT",
504
+ "name": "sys",
505
+ "version": "0.1.0"
506
}
507
],
508
"gxVersion": "0.10.0",