diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2026-04-10 10:26:09 +0200 |
|---|---|---|
| committer | Gopher Robot <gobot@golang.org> | 2026-04-10 10:49:43 -0700 |
| commit | 11655d2c1420dcc869a8e43087668221b657c67f (patch) | |
| tree | 431444d9954a913274c1bd78969e3faa3c14f066 | |
| parent | 27c0ad865c944a7c7c637fd0f97f48a422ca6fae (diff) | |
| download | go-11655d2c1420dcc869a8e43087668221b657c67f.tar.xz | |
net: drop always nil (*netFD).netFD error return value
Drop the always-nil error to simplify callers. This was missed in CL
764620.
Change-Id: I7a93640b5422d7441234e226aa8b541888b2ebea
Reviewed-on: https://go-review.googlesource.com/c/go/+/765220
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Nicholas Husin <husin@google.com>
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Nicholas Husin <nsh@golang.org>
| -rw-r--r-- | src/net/ipsock_plan9.go | 4 | ||||
| -rw-r--r-- | src/net/udpsock_plan9.go | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/net/ipsock_plan9.go b/src/net/ipsock_plan9.go index 9cdc15cdf1..d6cf11f7ca 100644 --- a/src/net/ipsock_plan9.go +++ b/src/net/ipsock_plan9.go @@ -249,8 +249,8 @@ func listenPlan9(ctx context.Context, net string, laddr Addr) (fd *netFD, err er return newFD(proto, name, nil, f, nil, laddr, nil), nil } -func (fd *netFD) netFD() (*netFD, error) { - return newFD(fd.net, fd.n, fd.listen, fd.ctl, fd.data, fd.laddr, fd.raddr), nil +func (fd *netFD) netFD() *netFD { + return newFD(fd.net, fd.n, fd.listen, fd.ctl, fd.data, fd.laddr, fd.raddr) } func (fd *netFD) acceptPlan9() (nfd *netFD, err error) { diff --git a/src/net/udpsock_plan9.go b/src/net/udpsock_plan9.go index 732a3b07ee..05011a4db2 100644 --- a/src/net/udpsock_plan9.go +++ b/src/net/udpsock_plan9.go @@ -133,8 +133,7 @@ func (sl *sysListener) listenUDP(ctx context.Context, laddr *UDPAddr) (*UDPConn, if err != nil { return nil, err } - fd, err := l.netFD() - return newUDPConn(fd), err + return newUDPConn(l.netFD()), nil } func (sl *sysListener) listenMulticastUDP(ctx context.Context, ifi *Interface, gaddr *UDPAddr) (*UDPConn, error) { @@ -174,9 +173,5 @@ func (sl *sysListener) listenMulticastUDP(ctx context.Context, ifi *Interface, g if err != nil { return nil, err } - fd, err := l.netFD() - if err != nil { - return nil, err - } - return newUDPConn(fd), nil + return newUDPConn(l.netFD()), nil } |