Skip to content

net: fix some ineffectual assignments reported by ineffassign #76704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
linsite wants to merge 1 commit into
base: master
Choose a base branch
from
Open

net: fix some ineffectual assignments reported by ineffassign #76704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/net/dial_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,14 +1088,16 @@ func TestDialContext(t *testing.T) {
var c Conn
switch network {
case "tcp", "tcp4", "tcp6":
raddr, err := netip.ParseAddrPort(ln.Addr().String())
var raddr netip.AddrPort
raddr, err = netip.ParseAddrPort(ln.Addr().String())
if err != nil {
t.Error(err)
continue
}
c, err = d.DialTCP(context.WithValue(context.Background(), "id", i+1), network, (*TCPAddr)(nil).AddrPort(), raddr)
case "unix", "unixpacket":
raddr, err := ResolveUnixAddr(network, ln.Addr().String())
var raddr *UnixAddr
raddr, err = ResolveUnixAddr(network, ln.Addr().String())
if err != nil {
t.Error(err)
continue
Expand Down Expand Up @@ -1131,14 +1133,16 @@ func TestDialContext(t *testing.T) {
var c2 Conn
switch network {
case "udp", "udp4", "udp6":
raddr, err := netip.ParseAddrPort(c1.LocalAddr().String())
var raddr netip.AddrPort
raddr, err = netip.ParseAddrPort(c1.LocalAddr().String())
if err != nil {
t.Error(err)
continue
}
c2, err = d.DialUDP(context.WithValue(context.Background(), "id", i+1), network, (*UDPAddr)(nil).AddrPort(), raddr)
case "unixgram":
raddr, err := ResolveUnixAddr(network, c1.LocalAddr().String())
var raddr *UnixAddr
raddr, err = ResolveUnixAddr(network, c1.LocalAddr().String())
if err != nil {
t.Error(err)
continue
Expand Down
6 changes: 2 additions & 4 deletions src/net/dnsclient_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,8 @@ func avoidDNS(name string) bool {
// nameList returns a list of names for sequential DNS queries.
func (conf *dnsConfig) nameList(name string) []string {
// Check name length (see isDomainName).
l := len(name)
rooted := l > 0 && name[l-1] == '.'
if l > 254 || l == 254 && !rooted {
rooted := len(name) > 0 && name[len(name)-1] == '.'
if len(name) > 254 || len(name) == 254 && !rooted {
return nil
}

Expand All @@ -511,7 +510,6 @@ func (conf *dnsConfig) nameList(name string) []string {

hasNdots := bytealg.CountString(name, '.') >= conf.ndots
name += "."
l++

// Build list of search choices.
names := make([]string, 0, 1+len(conf.search))
Expand Down