diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-01-17 14:20:29 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-01-17 14:20:29 +0000 |
| commit | c6d6367f848cfd8381aba41e035c5e7e873667c5 (patch) | |
| tree | a218e98243463fc27f5053b4444e2544c63cd57a /libgo/go/net/fd_unix.go | |
| parent | 9bff0086915f544fa648ea81131f035cb9ce79a4 (diff) | |
| download | gcc-c6d6367f848cfd8381aba41e035c5e7e873667c5.zip gcc-c6d6367f848cfd8381aba41e035c5e7e873667c5.tar.gz gcc-c6d6367f848cfd8381aba41e035c5e7e873667c5.tar.bz2 | |
libgo: update to Go1.10beta2 release
Reviewed-on: https://go-review.googlesource.com/87897
From-SVN: r256794
Diffstat (limited to 'libgo/go/net/fd_unix.go')
| -rw-r--r-- | libgo/go/net/fd_unix.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libgo/go/net/fd_unix.go b/libgo/go/net/fd_unix.go index e5afd1a..95d5e4f 100644 --- a/libgo/go/net/fd_unix.go +++ b/libgo/go/net/fd_unix.go @@ -173,7 +173,7 @@ func (fd *netFD) connect(ctx context.Context, la, ra syscall.Sockaddr) (rsa sysc return rsa, nil } default: - return nil, os.NewSyscallError("getsockopt", err) + return nil, os.NewSyscallError("connect", err) } runtime.KeepAlive(fd) } @@ -321,7 +321,7 @@ func (fd *netFD) dup() (f *os.File, err error) { // This also puts the old fd into blocking mode, meaning that // I/O will block the thread instead of letting us use the epoll server. // Everything will still work, just with more threads. - if err = syscall.SetNonblock(ns, false); err != nil { + if err = fd.pfd.SetBlocking(); err != nil { return nil, os.NewSyscallError("setnonblock", err) } |