From f229aea8fa2c61f135acc8efecf1753e66623fdf Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 19 Feb 2020 18:34:22 +0100 Subject: [PATCH] ipv4, ipv6: remove or move unused err* vars errNoSuchInterface is only used in ipv4/sys_asmreq.go which is not built e.g. on Linux, so move it there. Change-Id: I18b2e2ec8f321db3df164dcc6a69b8c92e6ab68c Reviewed-on: https://go-review.googlesource.com/c/net/+/220097 Run-TryBot: Tobias Klauser TryBot-Result: Gobot Gobot Reviewed-by: Matt Layher --- ipv4/helper.go | 17 +++++++---------- ipv4/sys_asmreq.go | 3 +++ ipv6/helper.go | 1 - 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/ipv4/helper.go b/ipv4/helper.go index b494a2cde..e845a7376 100644 --- a/ipv4/helper.go +++ b/ipv4/helper.go @@ -13,16 +13,13 @@ import ( ) var ( - errInvalidConn = errors.New("invalid connection") - errMissingAddress = errors.New("missing address") - errMissingHeader = errors.New("missing header") - errNilHeader = errors.New("nil header") - errHeaderTooShort = errors.New("header too short") - errExtHeaderTooShort = errors.New("extension header too short") - errInvalidConnType = errors.New("invalid conn type") - errNoSuchInterface = errors.New("no such interface") - errNoSuchMulticastInterface = errors.New("no such multicast interface") - errNotImplemented = errors.New("not implemented on " + runtime.GOOS + "/" + runtime.GOARCH) + errInvalidConn = errors.New("invalid connection") + errMissingAddress = errors.New("missing address") + errNilHeader = errors.New("nil header") + errHeaderTooShort = errors.New("header too short") + errExtHeaderTooShort = errors.New("extension header too short") + errInvalidConnType = errors.New("invalid conn type") + errNotImplemented = errors.New("not implemented on " + runtime.GOOS + "/" + runtime.GOARCH) // See https://www.freebsd.org/doc/en/books/porters-handbook/versions.html. freebsdVersion uint32 diff --git a/ipv4/sys_asmreq.go b/ipv4/sys_asmreq.go index c5eaafe96..76d670aca 100644 --- a/ipv4/sys_asmreq.go +++ b/ipv4/sys_asmreq.go @@ -7,12 +7,15 @@ package ipv4 import ( + "errors" "net" "unsafe" "golang.org/x/net/internal/socket" ) +var errNoSuchInterface = errors.New("no such interface") + func (so *sockOpt) setIPMreq(c *socket.Conn, ifi *net.Interface, grp net.IP) error { mreq := ipMreq{Multiaddr: [4]byte{grp[0], grp[1], grp[2], grp[3]}} if err := setIPMreqInterface(&mreq, ifi); err != nil { diff --git a/ipv6/helper.go b/ipv6/helper.go index f767b1f5d..c2d508f9c 100644 --- a/ipv6/helper.go +++ b/ipv6/helper.go @@ -15,7 +15,6 @@ var ( errMissingAddress = errors.New("missing address") errHeaderTooShort = errors.New("header too short") errInvalidConnType = errors.New("invalid conn type") - errNoSuchInterface = errors.New("no such interface") errNotImplemented = errors.New("not implemented on " + runtime.GOOS + "/" + runtime.GOARCH) )