diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-01-02 15:05:27 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-01-21 23:53:22 -0800 |
| commit | 5a8ea165926cb0737ab03bc48c18dc5198ab5305 (patch) | |
| tree | 962dc3357c57f019f85658f99e2e753e30201c27 /libgo/go/net/fd_unix.go | |
| parent | 6ac6529e155c9baa0aaaed7aca06bd38ebda5b43 (diff) | |
| download | gcc-5a8ea165926cb0737ab03bc48c18dc5198ab5305.zip gcc-5a8ea165926cb0737ab03bc48c18dc5198ab5305.tar.gz gcc-5a8ea165926cb0737ab03bc48c18dc5198ab5305.tar.bz2 | |
libgo: update to Go1.14beta1
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/214297
Diffstat (limited to 'libgo/go/net/fd_unix.go')
| -rw-r--r-- | libgo/go/net/fd_unix.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libgo/go/net/fd_unix.go b/libgo/go/net/fd_unix.go index 286d3f1..117f5a9 100644 --- a/libgo/go/net/fd_unix.go +++ b/libgo/go/net/fd_unix.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build aix darwin dragonfly freebsd hurd linux nacl netbsd openbsd solaris +// +build aix darwin dragonfly freebsd hurd linux netbsd openbsd solaris package net @@ -96,7 +96,7 @@ func (fd *netFD) connect(ctx context.Context, la, ra syscall.Sockaddr) (rsa sysc if err := fd.pfd.Init(fd.net, true); err != nil { return nil, err } - if deadline, _ := ctx.Deadline(); !deadline.IsZero() { + if deadline, hasDeadline := ctx.Deadline(); hasDeadline { fd.pfd.SetWriteDeadline(deadline) defer fd.pfd.SetWriteDeadline(noDeadline) } @@ -248,7 +248,7 @@ func (fd *netFD) accept() (netfd *netFD, err error) { return nil, err } if err = netfd.init(); err != nil { - fd.Close() + netfd.Close() return nil, err } lsa, _ := syscall.Getsockname(netfd.pfd.Sysfd) |